renamed switch-root.{service,target} -> initrd-switch-root

diff --git a/Makefile b/Makefile
index 3373ed0..3d48d00 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -62,8 +62,8 @@ install: doc dracut-version.sh
                        modules.d/98systemd/dracut-pre-pivot.service \
                        modules.d/98systemd/dracut-pre-trigger.service \
                        modules.d/98systemd/dracut-pre-udev.service \
-                       modules.d/98systemd/switch-root.service \
-                       modules.d/98systemd/switch-root.target \
+                       modules.d/98systemd/initrd-switch-root.service \
+                       modules.d/98systemd/initrd-switch-root.target \
                        dracut-shutdown.service; do \
                                install -m 0644 $$i $(DESTDIR)$(systemdsystemunitdir); \
                done; \

diff --git a/modules.d/98systemd/dracut-initqueue.sh b/modules.d/98systemd/dracut-initqueue.sh
index 5b6994d..52b9cf5 100755 (executable)
--- a/modules.d/98systemd/dracut-initqueue.sh
+++ b/modules.d/98systemd/dracut-initqueue.sh
@@ -109,4 +109,4 @@ done
 
 export -p > /dracut-state.sh
 
-systemctl isolate switch-root.target
+systemctl isolate initrd-switch-root.target

diff --git a/modules.d/98systemd/dracut-pre-pivot.service b/modules.d/98systemd/dracut-pre-pivot.service
index 112834a..410e03e 100644 (file)
--- a/modules.d/98systemd/dracut-pre-pivot.service
+++ b/modules.d/98systemd/dracut-pre-pivot.service
@@ -10,7 +10,7 @@
 [Unit]
 Description=Dracut pre-pivot and cleanup hook
 DefaultDependencies=no
-Before=switch-root.service
+Before=initrd-switch-root.service
 
 [Service]
 Environment=HOME=/

diff --git a/modules.d/98systemd/switch-root.service b/modules.d/98systemd/initrd-switch-root.service
similarity index 100%
rename from modules.d/98systemd/switch-root.service
rename to modules.d/98systemd/initrd-switch-root.service

diff --git a/modules.d/98systemd/switch-root.target b/modules.d/98systemd/initrd-switch-root.target
similarity index 85%
rename from modules.d/98systemd/switch-root.target
rename to modules.d/98systemd/initrd-switch-root.target
index adfb32c..5f39711 100644 (file)
--- a/modules.d/98systemd/switch-root.target
+++ b/modules.d/98systemd/initrd-switch-root.target
@@ -10,7 +10,7 @@
 [Unit]
 Description=Switch Root
 DefaultDependencies=no
-Requires=switch-root.service
-Before=switch-root.service
+Requires=initrd-switch-root.service
+Before=initrd-switch-root.service
 AllowIsolate=yes
 

diff --git a/modules.d/98systemd/module-setup.sh b/modules.d/98systemd/module-setup.sh
index c045af5..1528a21 100755 (executable)
--- a/modules.d/98systemd/module-setup.sh
+++ b/modules.d/98systemd/module-setup.sh
@@ -102,8 +102,8 @@ install() {
     system/single.service \
     system/syslog.socket \
     system/syslog.target \
-    system/switch-root.target \
-    system/switch-root.service \
+    system/initrd-switch-root.target \
+    system/initrd-switch-root.service \
     system/umount.target \
     ;do
         [ -e "/lib/systemd/$i" ] && dracut_install "/lib/systemd/$i"
@@ -123,8 +123,8 @@ install() {
     inst "$moddir/emergency.service" /lib/systemd/system/emergency.service
     rm -f "$initdir/lib/systemd/system/rescue.service"
     inst "$moddir/rescue.service" /lib/systemd/system/rescue.service
-    inst "$moddir/switch-root.target" /lib/systemd/system/switch-root.target
-    inst "$moddir/switch-root.service" /lib/systemd/system/switch-root.service
+    inst "$moddir/initrd-switch-root.target" /lib/systemd/system/initrd-switch-root.target
+    inst "$moddir/initrd-switch-root.service" /lib/systemd/system/initrd-switch-root.service
     ln -s basic.target "$initdir/lib/systemd/system/default.target"
 
     inst "$moddir/dracut-cmdline.sh" /lib/systemd/system-generators/dracut-cmdline.sh
@@ -140,11 +140,11 @@ install() {
     inst "$moddir/dracut-initqueue.sh" /bin/dracut-initqueue
     inst "$moddir/dracut-initqueue.service" /lib/systemd/system/dracut-initqueue.service
     ln -s ../dracut-initqueue.service "$initdir/lib/systemd/system/basic.target.wants/dracut-initqueue.service"
-    
+
     inst "$moddir/dracut-pre-pivot.sh" /bin/dracut-pre-pivot
     inst "$moddir/dracut-pre-pivot.service" /lib/systemd/system/dracut-pre-pivot.service
-    mkdir -p "$initdir/lib/systemd/system/switch-root.target.wants"
-    ln -s ../dracut-pre-pivot.service "$initdir/lib/systemd/system/switch-root.target.wants/dracut-pre-pivot.service"
-    > "$initdir/etc/machine-id" 
+    mkdir -p "$initdir/lib/systemd/system/initrd-switch-root.target.wants"
+    ln -s ../dracut-pre-pivot.service "$initdir/lib/systemd/system/initrd-switch-root.target.wants/dracut-pre-pivot.service"
+    > "$initdir/etc/machine-id"
 }