On Fri, 23.01.15 14:35, Cristian RodrÃguez (crrodrig...@opensuse.org) wrote:
Thanks! Applied!
---
Makefile.am | 1 +
configure.ac | 2 ++
units/console-shell.service.m4.in | 2 +-
units/emergency.service.in| 2 +-
units/rescue.service.in | 2 +-
5 files changed, 6 insertions(+), 3 deletions(-)
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 21], [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=-@SULOGIN@
ExecStopPost=-@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
--
2.2.2
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
Lennart
--
Lennart Poettering, Red Hat
___
systemd-devel mailing list
systemd-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/systemd-devel
