summaryrefslogtreecommitdiff
path: root/units
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2016-01-17 17:25:42 +0100
committerLennart Poettering <lennart@poettering.net>2016-01-17 20:47:46 +0100
commitcde3d687506d0d92a5efe8a925047b4c828e6f98 (patch)
tree5e47ab34065c9c157b7618621a4658cfc1936a70 /units
parentc15493f4822b7176f0a6449e8f335844f512eed4 (diff)
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
Diffstat (limited to 'units')
-rw-r--r--units/console-shell.service.m4.in2
-rw-r--r--units/emergency.service.in2
-rw-r--r--units/rescue.service.in2
3 files changed, 3 insertions, 3 deletions
diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in
index 5c80722829..a345ec25d4 100644
--- 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 8dc3cbdede..fb390eacfe 100644
--- 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 432e4f3c84..6c202174d3 100644
--- 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"