From: Harald Hoyer <harald@redhat.com>
Date: Thu, 4 Oct 2012 17:24:07 +0000 (-0400)
Subject: systemd: rename emergency.service to dracut-emergency.service for rd.shell
X-Git-Tag: 024~35
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2242cd92ee5c08ea97a6ceea7203790791471513;p=thirdparty%2Fdracut.git

systemd: rename emergency.service to dracut-emergency.service for rd.shell
---

diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
index b980fe325..6e6bf0792 100755
--- a/modules.d/98systemd/module-setup.sh
+++ b/modules.d/98systemd/module-setup.sh
@@ -29,6 +29,7 @@ install() {
         $systemdutildir/systemd-fsck \
         $systemdutildir/systemd-udevd \
         $systemdutildir/systemd-journald \
+        $systemdutildir/systemd-sysctl \
         $systemdsystemunitdir/emergency.target \
         $systemdsystemunitdir/sysinit.target \
         $systemdsystemunitdir/basic.target \
@@ -56,6 +57,7 @@ install() {
         $systemdsystemunitdir/systemd-ask-password-plymouth.path \
         $systemdsystemunitdir/systemd-journald.socket \
         $systemdsystemunitdir/systemd-ask-password-console.service \
+        $systemdsystemunitdir/emergency.service \
         $systemdsystemunitdir/halt.service \
         $systemdsystemunitdir/poweroff.service \
         $systemdsystemunitdir/systemd-reboot.service \
@@ -105,7 +107,7 @@ install() {
 
     ln -fs $systemdutildir/systemd "$initdir/init"
 
-    inst_simple "$moddir/emergency.service" ${systemdsystemunitdir}/emergency.service
+    inst_simple "$moddir/dracut-emergency.service" ${systemdsystemunitdir}/dracut-emergency.service
     inst_simple "$moddir/rescue.service" ${systemdsystemunitdir}/rescue.service
     ln -fs "basic.target" "${initdir}${systemdsystemunitdir}/default.target"
 
diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 7c1c31b4b..313f4146f 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -876,7 +876,7 @@ _emergency_shell()
     if [ -n "$DRACUT_SYSTEMD" ]; then
         > /.console_lock
         echo "PS1=\"$_name:\${PWD}# \"" >/etc/profile
-        systemctl start emergency.service
+        systemctl start dracut-emergency.service
         rm -f /.console_lock
     else
         echo "Dropping to debug shell."