[OE-core] [PATCH] systemd: Use ${ROOT_HOME} instead of /root

Dan McGregor danismostlikely at gmail.com
Wed Sep 3 19:57:58 UTC 2014


From: Dan McGregor <dan.mcgregor at usask.ca>

systemd avoids using nss lookups for the root user, so
naturally it assumes that root's home directory is /root.
In OE that's not the case, and it can lead to long delays when
shutting down due to user shutdown unit failures.

Signed-off-by: Dan McGregor <dan.mcgregor at usask.ca>
---
 meta/recipes-core/systemd/systemd_216.bb | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/meta/recipes-core/systemd/systemd_216.bb
b/meta/recipes-core/systemd/systemd_216.bb
index a7fd71e..e6b79d2 100644
--- a/meta/recipes-core/systemd/systemd_216.bb
+++ b/meta/recipes-core/systemd/systemd_216.bb
@@ -97,6 +97,10 @@ do_configure_prepend() {
  cp -r ${S}/units ${S}/units.pre_sed
  fi
  sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service*
+ sed -i -e 's:"/root":"${ROOT_HOME}":g' \
+        ${S}/src/core/unit-printf.c \
+        ${S}/src/nspawn/nspawn.c \
+        ${S}/src/shared/util.c
  sed -i '/ln --relative --help/d' ${S}/configure.ac
  sed -i -e 's:\$(LN_S) --relative -f:lnr:g' ${S}/Makefile.am
  sed -i -e 's:\$(LN_S) --relative:lnr:g' ${S}/Makefile.am
-- 
1.9.3



More information about the Openembedded-core mailing list