From: Harald Hoyer <harald@redhat.com>
Date: Wed, 6 Mar 2013 16:04:00 +0000 (+0100)
Subject: rootfs-block: in systemd mode, functionality is in the dracut services
X-Git-Tag: 026~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2673ff1932274cd32897db6b851ac050230d85b0;p=thirdparty%2Fdracut.git

rootfs-block: in systemd mode, functionality is in the dracut services
---

diff --git a/modules.d/95rootfs-block/module-setup.sh b/modules.d/95rootfs-block/module-setup.sh
index 732aefb76..0c7701dc5 100755
--- a/modules.d/95rootfs-block/module-setup.sh
+++ b/modules.d/95rootfs-block/module-setup.sh
@@ -23,7 +23,6 @@ check() {
             echo "root.journaldev=$journaldev" >> "${initdir}/etc/cmdline.d/95root-jurnaldev.conf"
         fi
     return 0
-
 }
 
 depends() {
@@ -32,8 +31,10 @@ depends() {
 
 install() {
     dracut_install umount
-    inst_hook cmdline 95 "$moddir/parse-block.sh"
-    inst_hook pre-udev 30 "$moddir/block-genrules.sh"
-    inst_hook mount 99 "$moddir/mount-root.sh"
+    if ! dracut_module_included "systemd"; then
+        inst_hook cmdline 95 "$moddir/parse-block.sh"
+        inst_hook pre-udev 30 "$moddir/block-genrules.sh"
+        inst_hook mount 99 "$moddir/mount-root.sh"
+    fi
 }