]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
plymouth: do not install hooks in systemd mode
authorHarald Hoyer <harald@redhat.com>
Wed, 13 Mar 2013 09:51:17 +0000 (10:51 +0100)
committerHarald Hoyer <harald@redhat.com>
Wed, 13 Mar 2013 12:01:20 +0000 (13:01 +0100)
modules.d/50plymouth/module-setup.sh

index 1c5dad53cf659e2772c6db0f936350945991ff02..f754e24901bfbdfe766b7f7e64813bf429978779 100755 (executable)
@@ -17,12 +17,16 @@ install() {
         . "$moddir"/plymouth-populate-initrd.sh
     else
         PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="$dracutfunctions" \
-            /usr/libexec/plymouth/plymouth-populate-initrd -t $initdir
+            /usr/libexec/plymouth/plymouth-populate-initrd -t "$initdir"
     fi
 
-    inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
-    inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
     inst_hook emergency 50 "$moddir"/plymouth-emergency.sh
+
     dracut_install readlink
+
+    if ! dracut_module_included "systemd"; then
+        inst_hook pre-trigger 10 "$moddir"/plymouth-pretrigger.sh
+        inst_hook pre-pivot 90 "$moddir"/plymouth-newroot.sh
+    fi
 }