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 b980fe325f2f5e4168ef0b5b762bc6fad98b8b57..6e6bf0792d631d052e03d5d12ba44aeab4d4e247 100755 (executable)
--- 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 7c1c31b4bfc5920b6e10ad6f132fef558589421c..313f4146f507c8730722c264ff2f36eab66eb7ef 100755 (executable)
--- 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."