[arch-projects] [mkinitcpio] [PATCH 2/3] init: remove support for disablemodules

[Dave Reisner]

This is no longer supported, as m-i-t supports modprobe.blacklist=
syntax on the kernel cmdline. We load all modules from the config at
once with --all and --use-blacklist flags in order to honor the cmdline
blacklisting.

Signed-off-by: Dave Reisner <d at falconindy.com>
---
 init |   14 +-------------
 1 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/init b/init
index a99940a..f63cbaf 100644
--- a/init
+++ b/init
@@ -45,12 +45,6 @@ if [ -n "${disablehooks}" ]; then
     done
 fi
 
-if [ -n "${disablemodules}" ]; then
-    for d in $(echo "${disablemodules}" | sed 's|,| |g'); do
-        eval "mod_${d}=disabled"
-    done
-fi
-
 if [ -n "${earlymodules}" ]; then
     for m in $(echo "${earlymodules}" | sed 's|,| |g'); do
         /sbin/modprobe -q ${m} > /dev/null 2>&1
@@ -59,13 +53,7 @@ fi
 
 . /config
 
-for m in ${MODULES}; do
-    TST=""
-    eval "TST=\$mod_${m}"
-    if [ "${TST}" != "disabled" ]; then
-        /sbin/modprobe -q ${m} > /dev/null 2>&1
-    fi
-done
+/sbin/modprobe -qab $MODULES
 
 # If rootdelay is empty or not a non-negative integer, set it to 10
 if [ -z "${rootdelay}" ] || ! [ "${rootdelay}" -ge 0 ]; then
-- 
1.7.5.4