From 77ff585ab48626ade2d312102ae98202bf8b8d98 Mon Sep 17 00:00:00 2001
From: Michael Janczyk
Date: Tue, 4 Dec 2012 18:32:15 +0100
Subject: - respect blacklisting of modules when autoloading modules in
 hwautocfg '-b' (stage3). - preinit.local enabled again for
 config/systemName/default, until now it was only possible for the default
 system in config/default. It make no sense for client specific configurations
 though.

---
 src/initramfs/scripts/bin/hwautocfg | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/initramfs/scripts/bin/hwautocfg')

diff --git a/src/initramfs/scripts/bin/hwautocfg b/src/initramfs/scripts/bin/hwautocfg
index 22323e84..482c9f9a 100755
--- a/src/initramfs/scripts/bin/hwautocfg
+++ b/src/initramfs/scripts/bin/hwautocfg
@@ -66,11 +66,12 @@ fi
 nwcardlist=$(echo ${slxconf_listnwmod}|sed "s/\ /|/g")
 # save results for later info and for Xen plugin when starting Xen VM
 hwinfo --netcard --usb-ctrl >/etc/hwinfo.netcard-usbctrl
-grep modprobe /etc/hwinfo.netcard-usbctrl | grep -E "$nwcardlist|hcd" | \
-  grep -v ehci | sed 's/.* Cmd: "//;s/"//' | sort -u >/etc/modprobe.base
+grep modprobe /etc/hwinfo.netcard-usbctrl | grep -E "$nwcardlist|hcd" \
+  | grep -v ehci | sed 's/.* Cmd: "//;s/"//;s/modprobe/modprobe -b ${MODPRV}/' \
+  | sort -u >/etc/modprobe.base
 # virtio hack
 if [ $(grep -ic "virtio_pci" /etc/modprobe.base) -ge 1 ]; then
-  echo "modprobe virtio_net" >>/etc/modprobe.base
+  echo 'modprobe ${MODPRV} virtio_net' >>/etc/modprobe.base
 fi
 sh /etc/modprobe.base; mdev -s
 
@@ -97,9 +98,9 @@ hwmain () {
 # check for rtc if not compiled directly into the kernel
 ( [ -e /proc/driver/rtc ] || modprobe ${MODPRV} rtc-cmos ) &
 waitfor /tmp/hwdataready 10000
-sed '/Driver Info #1/,/Config Status:/d' \
-  /etc/hwinfo.data | grep modprobe | sed "s|.* Cmd: \"||;s|\"|$modloadbg|" \
-    | sort -u >/etc/modprobe.pci
+sed '/Driver Info #1/,/Config Status:/d' /etc/hwinfo.data | grep modprobe \
+  | sed "s|.* Cmd: \"||;s|\"|$modloadbg|;s|modprobe|modprobe -b ${MODPRV}|" \
+  | sort -u >/etc/modprobe.pci
 sh /etc/modprobe.pci
 mdev -s
 
-- 
cgit v1.2.3-55-g7522