units: don't fail if /root doesn't exist for shell units

As discussed on the ML:

http://lists.freedesktop.org/archives/systemd-devel/2016-January/035594.html

diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
index 5c807228294e099a319b8d0561e3bf78820bf20d..a345ec25d43fb97d6c5b08416e88f80e0c6f3ad1 100644 (file)
--- a/units/console-shell.service.m4.in
+++ b/units/console-shell.service.m4.in
@@ -16,7 +16,7 @@ Before=getty.target
 
 [Service]
 Environment=HOME=/root
-WorkingDirectory=/root
+WorkingDirectory=-/root
 ExecStart=-@SULOGIN@
 ExecStopPost=-@SYSTEMCTL@ poweroff
 Type=idle

diff --git a/units/emergency.service.in b/units/emergency.service.in
index 8dc3cbdede3fb234778f2fbbc0ed64c3384189fc..fb390eacfedfee931ea1ad863b81268fe4e1e81b 100644 (file)
--- a/units/emergency.service.in
+++ b/units/emergency.service.in
@@ -15,7 +15,7 @@ Before=shutdown.target
 
 [Service]
 Environment=HOME=/root
-WorkingDirectory=/root
+WorkingDirectory=-/root
 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"

diff --git a/units/rescue.service.in b/units/rescue.service.in
index 432e4f3c8458ee7dd8423248528f107d04854fea..6c202174d302acc5de0d5f0f1b4e4bda1ef0fd50 100644 (file)
--- a/units/rescue.service.in
+++ b/units/rescue.service.in
@@ -15,7 +15,7 @@ Before=shutdown.target
 
 [Service]
 Environment=HOME=/root
-WorkingDirectory=/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 "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"