From 3dc731c1d270e2e143de621db9bd898299fd849d Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Fri, 20 Feb 2015 05:24:49 +0000 Subject: [PATCH 10/11] Make root's home directory configurable OpenEmbedded has a configurable home directory for root. Allow systemd to be built using its idea of what root's home directory should be. Upstream-Status: Denied Upstream wants to have a unified hierarchy where everyone is using the same root folder. https://github.com/systemd/systemd/issues/541 Signed-off-by: Dan McGregor Signed-off-by: Khem Raj --- Makefile.am | 2 ++ configure.ac | 7 +++++++ src/core/unit-printf.c | 2 +- src/nspawn/nspawn.c | 4 ++-- src/basic/util.c | 4 ++-- units/console-shell.service.m4.in | 4 ++-- units/emergency.service.in | 4 ++-- units/rescue.service.in | 4 ++-- 8 files changed, 20 insertions(+), 11 deletions(-) Index: git/Makefile.am =================================================================== --- git.orig/Makefile.am +++ git/Makefile.am @@ -208,6 +208,7 @@ AM_CPPFLAGS = \ -DLIBDIR=\"$(libdir)\" \ -DROOTLIBDIR=\"$(rootlibdir)\" \ -DROOTLIBEXECDIR=\"$(rootlibexecdir)\" \ + -DROOTHOMEDIR=\"$(roothomedir)\" \ -DTEST_DIR=\"$(abs_top_srcdir)/test\" \ -I $(top_srcdir)/src \ -I $(top_builddir)/src/basic \ @@ -5615,6 +5616,7 @@ EXTRA_DIST += \ substitutions = \ '|rootlibexecdir=$(rootlibexecdir)|' \ '|rootbindir=$(rootbindir)|' \ + '|roothomedir=$(roothomedir)|' \ '|bindir=$(bindir)|' \ '|SYSTEMCTL=$(rootbindir)/systemctl|' \ '|SYSTEMD_NOTIFY=$(rootbindir)/systemd-notify|' \ Index: git/configure.ac =================================================================== --- git.orig/configure.ac +++ git/configure.ac @@ -1383,6 +1383,11 @@ AC_ARG_WITH([rootlibdir], [with_rootlibdir=${libdir}]) AX_NORMALIZE_PATH([with_rootlibdir]) +AC_ARG_WITH([roothomedir], + AS_HELP_STRING([--with-roothomedir=DIR], [Home directory for the root user]), + [], + [with_roothomedir=/root]) + AC_ARG_WITH([pamlibdir], AS_HELP_STRING([--with-pamlibdir=DIR], [Directory for PAM modules]), [], @@ -1474,6 +1479,7 @@ AC_SUBST([pamlibdir], [$with_pamlibdir]) AC_SUBST([pamconfdir], [$with_pamconfdir]) AC_SUBST([rootprefix], [$with_rootprefix]) AC_SUBST([rootlibdir], [$with_rootlibdir]) +AC_SUBST([roothomedir], [$with_roothomedir]) AC_CONFIG_FILES([ Makefile @@ -1563,6 +1569,7 @@ AC_MSG_RESULT([ includedir: ${includedir} lib dir: ${libdir} rootlib dir: ${with_rootlibdir} + root home dir: ${with_roothomedir} SysV init scripts: ${SYSTEM_SYSVINIT_PATH} SysV rc?.d directories: ${SYSTEM_SYSVRCND_PATH} Build Python: ${PYTHON} Index: git/src/core/unit-printf.c =================================================================== --- git.orig/src/core/unit-printf.c +++ git/src/core/unit-printf.c @@ -237,7 +237,7 @@ static int specifier_user_home(char spec * best of it if we can, but fail if we can't */ if (!c->user || streq(c->user, "root") || streq(c->user, "0")) - n = strdup("/root"); + n = strdup(ROOTHOMEDIR); else return -EOPNOTSUPP; Index: git/src/nspawn/nspawn.c =================================================================== --- git.orig/src/nspawn/nspawn.c +++ git/src/nspawn/nspawn.c @@ -4176,7 +4176,7 @@ static int inner_child( if (envp[n_env]) n_env ++; - if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: "/root") < 0) || + if ((asprintf((char**)(envp + n_env++), "HOME=%s", home ? home: ROOTHOMEDIR) < 0) || (asprintf((char**)(envp + n_env++), "USER=%s", arg_user ? arg_user : "root") < 0) || (asprintf((char**)(envp + n_env++), "LOGNAME=%s", arg_user ? arg_user : "root") < 0)) return log_oom(); @@ -4247,7 +4247,7 @@ static int inner_child( execvp(argv[optind], argv + optind); #endif /* HAVE_EXECVPE */ else { - chdir(home ? home : "/root"); + chdir(home ? home : ROOTHOMEDIR); execle("/bin/bash", "-bash", NULL, env_use); execle("/bin/sh", "-sh", NULL, env_use); } Index: git/src/basic/util.c =================================================================== --- git.orig/src/basic/util.c +++ git/src/basic/util.c @@ -3233,7 +3233,7 @@ int get_user_creds( *gid = 0; if (home) - *home = "/root"; + *home = ROOTHOMEDIR; if (shell) *shell = "/bin/sh"; @@ -4069,7 +4069,7 @@ int get_home_dir(char **_h) { /* Hardcode home directory for root to avoid NSS */ u = getuid(); if (u == 0) { - h = strdup("/root"); + h = strdup(ROOTHOMEDIR); if (!h) return -ENOMEM; Index: git/units/console-shell.service.m4.in =================================================================== --- git.orig/units/console-shell.service.m4.in +++ git/units/console-shell.service.m4.in @@ -15,8 +15,8 @@ After=rc-local.service Before=getty.target [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ ExecStart=-@SULOGIN@ ExecStopPost=-@SYSTEMCTL@ poweroff Type=idle Index: git/units/emergency.service.in =================================================================== --- git.orig/units/emergency.service.in +++ git/units/emergency.service.in @@ -14,8 +14,8 @@ Conflicts=rescue.service Before=shutdown.target [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ ExecStartPre=-/bin/plymouth --wait quit ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\ntry again to boot into default mode.' ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default" Index: git/units/rescue.service.in =================================================================== --- git.orig/units/rescue.service.in +++ git/units/rescue.service.in @@ -14,8 +14,8 @@ After=sysinit.target plymouth-start.serv Before=shutdown.target [Service] -Environment=HOME=/root -WorkingDirectory=/root +Environment=HOME=@roothomedir@ +WorkingDirectory=@roothomedir@ ExecStartPre=-/bin/plymouth quit ExecStartPre=-/bin/echo -e 'Welcome to emergency mode! After logging in, type "journalctl -xb" to view\\nsystem logs, "systemctl reboot" to reboot, "systemctl default" or ^D to\\nboot into default mode.' ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"