summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <d@falconindy.com>2011-06-04 16:18:16 +0200
committerDave Reisner <d@falconindy.com>2011-06-07 20:38:43 +0200
commit7a165fb842eb1dcfdd9aa27b74354245d6980d19 (patch)
tree18f922292ff33aebf981d3e2bac1ac908b0679f7
parent77fdafdb307abaacc994e114ff45ec98b4339d5c (diff)
downloadmkinitcpio-7a165fb842eb1dcfdd9aa27b74354245d6980d19.tar.gz
mkinitcpio-7a165fb842eb1dcfdd9aa27b74354245d6980d19.tar.xz
init: remove support for disablemodules
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@falconindy.com>
-rw-r--r--init14
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