diff -aNru systemd-master.orig/units/emergency.service.in systemd-master/units/emergency.service.in
--- systemd-master.orig/units/emergency.service.in	2015-06-01 12:51:14.891488136 +0000
+++ systemd-master/units/emergency.service.in	2015-06-01 12:52:42.447493758 +0000
@@ -18,7 +18,8 @@
 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 "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
+ExecStart=-@SULOGIN@
+ExecStopPost=-@SYSTEMCTL@ --job-mode=fail --no-block default
 Type=idle
 StandardInput=tty-force
 StandardOutput=inherit
diff -aNru systemd-master.orig/units/rescue.service.in systemd-master/units/rescue.service.in
--- systemd-master.orig/units/rescue.service.in	2015-06-01 12:51:14.883488136 +0000
+++ systemd-master/units/rescue.service.in	2015-06-01 13:02:00.711529600 +0000
@@ -17,8 +17,9 @@
 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 "@SULOGIN@; @SYSTEMCTL@ --job-mode=fail --no-block default"
+ExecStartPre=-/bin/echo -e 'Welcome to rescue 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=-@SULOGIN@
+ExecStopPost=-@SYSTEMCTL@ --job-mode=fail --no-block default
 Type=idle
 StandardInput=tty-force
 StandardOutput=inherit