Move finding and mounting root on block devices into its own hook.

diff --git a/modules.d/95rootfs-block/install b/modules.d/95rootfs-block/install
new file mode 100755 (executable)
index 0000000..8782fb5
--- /dev/null
+++ b/modules.d/95rootfs-block/install
@@ -0,0 +1,3 @@
+#!/bin/sh
+inst_hook pre-udev 10 "$moddir/parse-root-opts.sh"
+inst_hook mount 99 "$moddir/mount-root.sh"

diff --git a/modules.d/99base/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
similarity index 100%
rename from modules.d/99base/mount-root.sh
rename to modules.d/95rootfs-block/mount-root.sh

diff --git a/modules.d/99base/parse-root-opts.sh b/modules.d/95rootfs-block/parse-root-opts.sh
similarity index 100%
rename from modules.d/99base/parse-root-opts.sh
rename to modules.d/95rootfs-block/parse-root-opts.sh

diff --git a/modules.d/99base/install b/modules.d/99base/install
index 30f18f9..2bb83e9 100755 (executable)
--- a/modules.d/99base/install
+++ b/modules.d/99base/install
@@ -3,7 +3,4 @@ dracut_install mount mknod mkdir modprobe pidof sleep chroot echo sed sh ls
 # install our scripts and hooks
 inst "$moddir/init" "/init"
 inst "$moddir/switch_root" "/sbin/switch_root"
-inst_hook pre-udev 10 "$moddir/parse-root-opts.sh"
 inst_hook pre-pivot 50 "$moddir/selinux-loadpolicy.sh"
-inst_hook mount 90 "$moddir/resume.sh"
-inst_hook mount 99 "$moddir/mount-root.sh"