move insmodpost and blacklisting to 90kernel-modules

also correctly parse rd.driver.{blacklist,pre,post}

diff --git a/modules.d/96insmodpost/insmodpost.sh b/modules.d/90kernel-modules/insmodpost.sh
similarity index 74%
rename from modules.d/96insmodpost/insmodpost.sh
rename to modules.d/90kernel-modules/insmodpost.sh
index 92d7e196a90f9ce8dbad2a8ffea0bdfcf10bb03c..c3d77140165ac81adecfbe04f5ef2156c88ceb12 100755 (executable)
--- a/modules.d/96insmodpost/insmodpost.sh
+++ b/modules.d/90kernel-modules/insmodpost.sh
@@ -1,9 +1,8 @@
 #!/bin/sh
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-. /lib/dracut-lib.sh
 
-for p in $(getargs rd.insmodpost rdinsmodpost=); do 
+for p in $(getargs rd.driver.post rdinsmodpost=); do 
     (
         IFS=,
         for p in $i; do 

diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
index 534bbdbe9b93528ea5262e6d26d7b38ec0fe153a..3a2560eb2d0cf97c7c5b69b7264c88c0507abb92 100755 (executable)
--- a/modules.d/90kernel-modules/module-setup.sh
+++ b/modules.d/90kernel-modules/module-setup.sh
@@ -46,5 +46,6 @@ install() {
     [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
     dracut_install $(find /etc/modprobe.d/ -type f -name '*.conf')
     inst_hook cmdline 01 "$moddir/parse-kernel.sh"
+    inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
     inst "$srcmods/modules.builtin.bin" "/lib/modules/$kernel/modules.builtin.bin"
 }

diff --git a/modules.d/90kernel-modules/parse-kernel.sh b/modules.d/90kernel-modules/parse-kernel.sh
index cc84b5539f663cf41e02060aeb5720de97206c5f..fceccaafc7fd18b6c9479fba08f39717479919ee 100755 (executable)
--- a/modules.d/90kernel-modules/parse-kernel.sh
+++ b/modules.d/90kernel-modules/parse-kernel.sh
@@ -2,7 +2,7 @@
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
 
-for p in $(getargs rd.loaddriver rdloaddriver=); do 
+for p in $(getargs rd.driver.pre rdloaddriver=); do 
     ( 
         IFS=,
         for p in $i; do 
@@ -11,3 +11,19 @@ for p in $(getargs rd.loaddriver rdloaddriver=); do
     )
 done
 
+for p in $(getargs rd.driver.blacklist rdblacklist=); do 
+    (
+        IFS=,
+        for p in $i; do 
+            echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
+        done
+    )
+done
+
+for p in $(getargs rd.driver.post rdinsmodpost=); do 
+    echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
+    _do_insmodpost=1
+done
+
+[ -n "$_do_insmodpost" ] && /sbin/initqueue --settled --unique --onetime /sbin/insmodpost.sh
+unset _do_insmodpost

diff --git a/modules.d/96insmodpost/module-setup.sh b/modules.d/96insmodpost/module-setup.sh
deleted file mode 100755 (executable)
index 586765d..0000000
--- a/modules.d/96insmodpost/module-setup.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-check() {
-    return 0
-}
-
-depends() {
-    return 0
-}
-
-install() {
-    inst_hook cmdline 20 "$moddir/parse-insmodpost.sh"
-    inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
-}
-

diff --git a/modules.d/96insmodpost/parse-insmodpost.sh b/modules.d/96insmodpost/parse-insmodpost.sh
deleted file mode 100755 (executable)
index fd375b2..0000000
--- a/modules.d/96insmodpost/parse-insmodpost.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-for p in $(getargs rd.insmodpost rdinsmodpost=); do 
-    echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
-    _do_insmodpost=1
-done
-
-[ -n "$_do_insmodpost" ] && /sbin/initqueue --settled --unique --onetime /sbin/insmodpost.sh
-unset _do_insmodpost

diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
index db5fab8d7bea6539139795d18f237d31fda37288..c219d8f9700bec6cadeaff929253253eba58545d 100755 (executable)
--- a/modules.d/99base/module-setup.sh
+++ b/modules.d/99base/module-setup.sh
@@ -38,7 +38,6 @@ install() {
     fi
     inst "$moddir/dracut-lib.sh" "/lib/dracut-lib.sh"
     inst_hook cmdline 10 "$moddir/parse-root-opts.sh"
-    inst_hook cmdline 20 "$moddir/parse-blacklist.sh"
     mkdir -p "${initdir}/var"
     [ -x /lib/systemd/systemd-timestamp ] && inst /lib/systemd/systemd-timestamp
 }

diff --git a/modules.d/99base/parse-blacklist.sh b/modules.d/99base/parse-blacklist.sh
deleted file mode 100755 (executable)
index 79e10dc..0000000
--- a/modules.d/99base/parse-blacklist.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-for p in $(getargs rd.module.blacklist rdblacklist=); do 
-    (
-        IFS=,
-        for p in $i; do 
-            echo "blacklist $p" >> /etc/modprobe.d/initramfsblacklist.conf
-        done
-    )
-done