diff options
| author | Dan McGregor <dan.mcgregor@usask.ca> | 2014-09-03 13:49:28 -0600 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-10-24 17:36:13 +0100 |
| commit | fd50427935b242971202b4f855ae291d95c261a6 (patch) | |
| tree | 68dd990ff7147e9716609af4fb510f7e1767f812 /meta/recipes-core/systemd/systemd_216.bb | |
| parent | ad065f94acb0bfb81e33935890a1db251d6e2979 (diff) | |
| download | ast2050-yocto-poky-fd50427935b242971202b4f855ae291d95c261a6.zip ast2050-yocto-poky-fd50427935b242971202b4f855ae291d95c261a6.tar.gz | |
systemd: Use ${ROOT_HOME} instead of /root
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.
(From OE-Core rev: e1efc61979b329c651c15acff1afeba2987397b5)
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd_216.bb')
| -rw-r--r-- | meta/recipes-core/systemd/systemd_216.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_216.bb b/meta/recipes-core/systemd/systemd_216.bb index ebf9395..598d45e 100644 --- a/meta/recipes-core/systemd/systemd_216.bb +++ b/meta/recipes-core/systemd/systemd_216.bb @@ -32,6 +32,7 @@ SRC_URI = "git://anongit.freedesktop.org/systemd/systemd;branch=master;protocol= file://uclibc-get-physmem.patch \ file://0001-add-support-for-executing-scripts-under-etc-rcS.d.patch \ file://0001-missing.h-add-fake-__NR_memfd_create-for-MIPS.patch \ + file://0001-Make-root-s-home-directory-configurable.patch \ file://touchscreen.rules \ file://00-create-volatile.conf \ file://init \ @@ -74,6 +75,7 @@ rootlibexecdir = "${rootprefix}/lib" # The gtk+ tools should get built as a separate recipe e.g. systemd-tools EXTRA_OECONF = " --with-rootprefix=${rootprefix} \ --with-rootlibdir=${rootlibdir} \ + --with-roothomedir=${ROOT_HOME} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)} \ --disable-manpages \ --disable-coredump \ @@ -99,7 +101,6 @@ do_configure_prepend() { else cp -r ${S}/units ${S}/units.pre_sed fi - sed -i -e 's:=/root:=${ROOT_HOME}:g' ${S}/units/*.service* 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 |
