root option parsing belongs in 99base now

We use this for NFS root as well, and NFSv4 was getting broken when
it wasn't present.

diff --git a/modules.d/95rootfs-block/install b/modules.d/95rootfs-block/install
index b977f9b4886ef4500f8836bcebcfa1db3b6d04a7..618d357d9483b067c3c88f5c1e38c7b7b79b68c7 100755 (executable)
--- a/modules.d/95rootfs-block/install
+++ b/modules.d/95rootfs-block/install
@@ -1,5 +1,4 @@
 #!/bin/sh
-inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
 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"

diff --git a/modules.d/99base/install b/modules.d/99base/install
index 428eaf935b01a939c5bbab6b3110be5bec9b88f0..97dd2d328330e21a4780fe03c0cc01dba24d8339 100755 (executable)
--- a/modules.d/99base/install
+++ b/modules.d/99base/install
@@ -14,4 +14,5 @@ else
     inst "$moddir/switch_root" "/sbin/switch_root"
 fi
 inst "$moddir/dracut-lib" "/lib/dracut-lib"
+inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
 inst_hook pre-pivot 50 "$moddir/selinux-loadpolicy.sh"

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