diff options
| author |   Thomas Deutschmann <whissi@gentoo.org> | 2020-08-26 23:35:52 +0200 |
|---|---|---|
| committer | Thomas Deutschmann <whissi@gentoo.org> | 2020-08-26 23:46:37 +0200 |
| commit | 809f1f547f0ba8bfa38bbd0977ab2c57ec4c4581 (patch) | |
| tree | 365a2a64e446bcd4b83b4b540aa3e7b609cb4292 /defaults/linuxrc | |
| parent | eudev: Enable kmod support (diff) | |
| download | genkernel-809f1f547f0ba8bfa38bbd0977ab2c57ec4c4581.tar.gz genkernel-809f1f547f0ba8bfa38bbd0977ab2c57ec4c4581.tar.bz2 genkernel-809f1f547f0ba8bfa38bbd0977ab2c57ec4c4581.zip | |
defaults/linuxrc: Disable processing of modules_load file by default
Now that we are using (e)udev with kmod support, we can rely on UDEV to
load required kernel modules.
Old module loading based on modules_load file can still be enabled via
boolean "gk.hw.use-modules_load" kernel command-line option which is inverting
and replacing previous "nodetect" kernel command-line option.
Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'defaults/linuxrc')
| -rw-r--r-- | defaults/linuxrc | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/defaults/linuxrc b/defaults/linuxrc index 9793fde6..263f7381 100644 --- a/defaults/linuxrc +++ b/defaults/linuxrc @@ -175,9 +175,6 @@ do doload=*) MDOLIST=$(echo ${MDOLIST} ${x#*=} | sed -e 's/^\ *//;s/,/ /g') ;; - nodetect) - NODETECT=1 - ;; noload=*) MLIST=$(echo ${MLIST} ${x#*=} | sed -e 's/^\ *//;s/,/ /g') export MLIST @@ -291,6 +288,14 @@ do fi unset tmp_disabled ;; + gk.hw.use-modules_load=*) + tmp_disabled=${x#*=} + if is_true "${tmp_disabled}" + then + GK_HW_USE_MODULES_LOAD=1 + fi + unset tmp_disabled + ;; gk.log.disabled=*) tmp_disabled=${x#*=} if is_true "${tmp_disabled}" @@ -542,26 +547,31 @@ fi # Load modules listed in MY_HWOPTS if /lib/modules exists for the running kernel if [ -z "${DO_modules}" ] then - good_msg 'Skipping module load; disabled via commandline' + good_msg 'Skipping module load; disabled via command-line' elif [ -d "/lib/modules/${KV}" ] then - good_msg 'Loading modules ...' if [ -n "${FIRSTMODS}" ] then + good_msg 'Loading first modules ...' # try these modules first -- detected modules for root device: modules_load firstmods ${FIRSTMODS} fi # Load appropriate kernel modules - if [ "${NODETECT}" != '1' ] + if [ "${GK_HW_USE_MODULES_LOAD}" = '1' ] then + good_msg 'Loading modules ...' for modules in ${MY_HWOPTS} do modules_scan ${modules} done fi - # Always eval doload=... - modules_load extra_load ${MDOLIST} + + if [ -n "${MDOLIST}" ] + then + good_msg 'Loading modules from command-line ...' + modules_load extra_load ${MDOLIST} + fi else good_msg 'Skipping module load; no modules in the ramdisk!' fi |