From 51153fb18c15ded33da3c380462b039aceea7475 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Thu, 31 May 2012 09:14:17 +0200 Subject: [PATCH] removed scsi_wait_scan from standard install --- modules.d/01fips/module-setup.sh | 3 ++- modules.d/90kernel-modules/module-setup.sh | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules.d/01fips/module-setup.sh b/modules.d/01fips/module-setup.sh index 6bfe31e..075fc24 100755 --- a/modules.d/01fips/module-setup.sh +++ b/modules.d/01fips/module-setup.sh @@ -19,11 +19,12 @@ installkernel() { mkdir -m 0755 -p "${initdir}/etc/modprobe.d" for _mod in $_fipsmodules; do - if instmods $_mod; then + if hostonly='' instmods $_mod; then echo $_mod >> "${initdir}/etc/fipsmodules" echo "blacklist $_mod" >> "${initdir}/etc/modprobe.d/fips.conf" fi done + hostonly='' instmods scsi_wait_scan } install() { diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh index f4832c4..4df180b 100755 --- a/modules.d/90kernel-modules/module-setup.sh +++ b/modules.d/90kernel-modules/module-setup.sh @@ -68,9 +68,6 @@ installkernel() { hostonly='' instmods -c $filesystems || return 1 fi - # force install of scsi_wait_scan - hostonly='' instmods scsi_wait_scan - for _f in modules.builtin.bin modules.builtin; do [[ $srcmods/$_f ]] && break done || { -- 2.7.4