[systemd-commits] 2 commits - Makefile.am configure.ac src/core units/console-shell.service.m4.in units/emergency.service.in units/rescue.service.in

[Lennart Poettering]

 Makefile.am                       |    1 +
 configure.ac                      |    2 ++
 src/core/mount-setup.c            |    2 --
 units/console-shell.service.m4.in |    2 +-
 units/emergency.service.in        |    2 +-
 units/rescue.service.in           |    2 +-
 6 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit cb708b1c6d970cc2376fb2c7c24b479f6f129594
Author: Cristian Rodríguez <crrodriguez at opensuse.org>
Date:   Fri Jan 23 13:25:30 2015 -0300

    mount-setup: Do not bother with /proc/bus/usb
    
    Current systemd requires kernel >= 3.7 per the README file
    but CONFIG_USB_DEVICEFS disappeared from the kernel in
    upstream commit fb28d58b72aa9215b26f1d5478462af394a4d253
    (kernel 3.5-rc1)

diff --git a/src/core/mount-setup.c b/src/core/mount-setup.c
index 5919f77..521545e 100644
--- a/src/core/mount-setup.c
+++ b/src/core/mount-setup.c
@@ -120,8 +120,6 @@ static const MountPoint mount_table[] = {
 static const char ignore_paths[] =
         /* SELinux file systems */
         "/sys/fs/selinux\0"
-        /* Legacy kernel file system */
-        "/proc/bus/usb\0"
         /* Container bind mounts */
         "/proc/sys\0"
         "/dev/console\0"

commit 66b0e0e0e3652227fe107ab9d09fa14fd4bc4dfa
Author: Cristian Rodríguez <crrodriguez at opensuse.org>
Date:   Fri Jan 23 14:35:20 2015 -0300

    build-sys: lookup for sulogin, it might not be in /sbin

diff --git a/Makefile.am b/Makefile.am
index 45d7a34..c463f23 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6220,6 +6220,7 @@ substitutions = \
        '|rootprefix=$(rootprefix)|' \
        '|udevlibexecdir=$(udevlibexecdir)|' \
        '|SUSHELL=$(SUSHELL)|' \
+       '|SULOGIN=$(SULOGIN)|' \
        '|DEBUGTTY=$(DEBUGTTY)|' \
        '|KILL=$(KILL)|' \
        '|KMOD=$(KMOD)|' \
diff --git a/configure.ac b/configure.ac
index 6bd095c..12e4ab2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -98,6 +98,8 @@ AC_PATH_PROG([KMOD], [kmod], [/usr/bin/kmod], [$PATH:/usr/sbin:/sbin])
 
 AC_PATH_PROG([KEXEC], [kexec], [/usr/sbin/kexec], [$PATH:/usr/sbin:/sbin])
 
+AC_PATH_PROG([SULOGIN], [sulogin], [/usr/sbin/sulogin], [$PATH:/usr/sbin:/sbin])
+
 AS_IF([! ln --relative --help > /dev/null 2>&1], [AC_MSG_ERROR([*** ln doesn't support --relative ***])])
 
 M4_DEFINES=
diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
index 3f4904a..5c80722 100644
--- a/units/console-shell.service.m4.in
+++ b/units/console-shell.service.m4.in
@@ -17,7 +17,7 @@ Before=getty.target
 [Service]
 Environment=HOME=/root
 WorkingDirectory=/root
-ExecStart=-/sbin/sulogin
+ExecStart=- at SULOGIN@
 ExecStopPost=- at SYSTEMCTL@ poweroff
 Type=idle
 StandardInput=tty-force
diff --git a/units/emergency.service.in b/units/emergency.service.in
index 18973e7..2695d7b 100644
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -18,7 +18,7 @@ Environment=HOME=/root
 WorkingDirectory=/root
 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\\ntry again to boot into default mode.'
-ExecStart=-/bin/sh -c "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
+ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --fail --no-block default"
 Type=idle
 StandardInput=tty-force
 StandardOutput=inherit
diff --git a/units/rescue.service.in b/units/rescue.service.in
index fc93f1e..de73fee 100644
--- a/units/rescue.service.in
+++ b/units/rescue.service.in
@@ -18,7 +18,7 @@ Environment=HOME=/root
 WorkingDirectory=/root
 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 "/sbin/sulogin; @SYSTEMCTL@ --fail --no-block default"
+ExecStart=-/bin/sh -c "@SULOGIN@; @SYSTEMCTL@ --fail --no-block default"
 Type=idle
 StandardInput=tty-force
 StandardOutput=inherit