Date: Sunday, February 7, 2010 @ 16:43:37
Author: tpowa
Revision: 67524
upgpkg: hwdetect 2010.02-1
changed module loading
Modified:
hwdetect/trunk/PKGBUILD
hwdetect/trunk/hwdetect
----------+
PKGBUILD | 4 ++--
hwdetect | 34 +++++++++++++++++++---------------
2 files changed, 21 insertions(+), 17 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2010-02-07 21:42:04 UTC (rev 67523)
+++ PKGBUILD 2010-02-07 21:43:37 UTC (rev 67524)
@@ -1,7 +1,7 @@
# $Id$
# Maintainer: Tobias Powalowski <[email protected]>
pkgname=hwdetect
-pkgver=2009.12
+pkgver=2010.02
pkgrel=1
pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf /
rc.conf support"
arch=(i686 x86_64)
@@ -16,4 +16,4 @@
build() {
install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
}
-md5sums=('a1bcd8e9b47b7cbfbb3b936af75ab960')
+md5sums=('1c4dd29f64645dd7e464b71f1778ba8f')
Modified: hwdetect
===================================================================
--- hwdetect 2010-02-07 21:42:04 UTC (rev 67523)
+++ hwdetect 2010-02-07 21:43:37 UTC (rev 67524)
@@ -297,7 +297,7 @@
grep -v "ide/" /tmp/modules-stripped | grep -v "scsi/" | grep -v "fusion/" |
grep -v "block/sx8" | grep -v "message/fusion" | \
grep -v "block/cciss" | grep -v "block/cpqarray" | grep -v
"block/DAC960" | grep -v "ata/" | \
grep -v "net/" | grep -v "pcmcia/" | grep -v "usb/" | \
- grep -v "ieee1394/" | grep -v "usbhid/" >> /tmp/modules-sorted
+ grep -v "firewire" | grep -v "ieee1394/" | grep -v "usbhid/" | grep -v
"staging/" | grep -v "wireless/" >> /tmp/modules-sorted
# make a correct order for the modules, internal devices have priority!
# only use old ide modules if boot parameter 'ide-legacy' is given
if [ "$IDE_LEGACY" = "1" ]; then
@@ -341,19 +341,19 @@
# BLACKLIST="$BLACKLIST $(basename $x .ko)"
#done
# delete modules that are blacklisted
-BLACKLIST="${BLACKLIST} $(echo ${disablemodules} | sed 's|-|_|g' | sed 's|,|
|g')"
-for i in $BLACKLIST; do
- [ "$i" ] || continue
- sed -i -e "/^$i$/d" /tmp/moduleslist
- # since '-' and '_' are interchangeable, we have to cover both
- if [ "$(echo $i | grep '-')" ]; then
- i="$(echo $i | sed 's|-|_|g')"
- sed -i -e "/^$i$/d" /tmp/moduleslist
- elif [ "$(echo $i | grep '_')" ]; then
- i="$(echo $i | sed 's|_|-|g')"
- sed -i -e "/^$i$/d" /tmp/moduleslist
- fi
-done
+#BLACKLIST="${BLACKLIST} $(echo ${disablemodules} | sed 's|-|_|g' | sed 's|,|
|g')"
+#for i in $BLACKLIST; do
+# [ "$i" ] || continue
+# sed -i -e "/^$i$/d" /tmp/moduleslist
+# # since '-' and '_' are interchangeable, we have to cover both
+# if [ "$(echo $i | grep '-')" ]; then
+# i="$(echo $i | sed 's|-|_|g')"
+# sed -i -e "/^$i$/d" /tmp/moduleslist
+# elif [ "$(echo $i | grep '_')" ]; then
+# i="$(echo $i | sed 's|_|-|g')"
+# sed -i -e "/^$i$/d" /tmp/moduleslist
+# fi
+#done
listmods() {
key=$1 ; shift
@@ -402,7 +402,11 @@
--load-modules)
# load all detected pci modules
for i in $(cat /tmp/moduleslist); do
- modprobe $i > /dev/null 2>&1
+ if [ -e /lib/udev/load-modules.sh ]; then
+ /lib/udev/load-modules.sh $i >
/dev/null 2>&1
+ else
+ modprobe $i > /dev/null 2>&1
+ fi
done
;;
