[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)
Tobias Powalowski
tpowa at archlinux.org
Sun Dec 28 21:06:11 UTC 2008
Date: Sunday, December 28, 2008 @ 16:06:11
Author: tpowa
Revision: 22845
upgpkg: hwdetect 2008.12-3
Modified:
hwdetect/trunk/PKGBUILD
hwdetect/trunk/hwdetect
----------+
PKGBUILD | 6 +++---
hwdetect | 53 +++++++++++++++++++++++++++--------------------------
2 files changed, 30 insertions(+), 29 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-12-28 20:44:48 UTC (rev 22844)
+++ PKGBUILD 2008-12-28 21:06:11 UTC (rev 22845)
@@ -2,14 +2,14 @@
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=hwdetect
pkgver=2008.12
-pkgrel=2
+pkgrel=3
pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
arch=(i686 x86_64)
license=('GPL')
-depends=('sh' 'awk' 'grep' 'coreutils' 'sed')
+depends=('sh' 'awk' 'grep' 'coreutils' 'sed' 'e2fsprogs')
source=(hwdetect)
build() {
install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
}
-md5sums=('8954900f42fe9f1cfaf5a8d92ffcc092')
+md5sums=('7496ba5c5043e0e43557a5ee08500b92')
Modified: hwdetect
===================================================================
--- hwdetect 2008-12-28 20:44:48 UTC (rev 22844)
+++ hwdetect 2008-12-28 21:06:11 UTC (rev 22845)
@@ -31,6 +31,7 @@
echo " --show-other show OTHER modules"
echo ""
echo " For /etc/mkinitcpio.conf use:"
+ echo " --filesystem add filesystems to MODULES="
echo " --hostcontroller show MODULES= for all hostcontrollers"
echo " --vmware add BusLogic to MODULES for vmware"
echo ""
@@ -44,6 +45,7 @@
echo " --lvm2 add lvm2 to HOOKS="
echo " --keymap add keymap to HOOKS="
echo " --usb add usb to HOOKS="
+ echo " --usbinput add usbinput to HOOKS="
echo " --fw add fw to HOOKS="
echo " --pcmcia add pcmcia to HOOKS="
echo " --nfs add net to HOOKS="
@@ -97,8 +99,11 @@
[ "$(echo $* | grep '\-keymap')" ] && KEYMAP=1
# usb switch
-[ "$(echo $* | grep '\-usb')" ] && USB=1
+[ "$(echo $* | grep '\-usb ')" ] && USB=1
+# usbinput switch
+[ "$(echo $* | grep '\-usbinput')" ] && USBINPUT=1
+
# fw switch
[ "$(echo $* | grep '\-fw')" ] && FW=1
@@ -121,7 +126,11 @@
: >/tmp/modules-stripped
: >/tmp/modules-sorted
: >/tmp/moduleslist
+: >/tmp/blkid
+# generate blkid
+blkid -c /dev/null -s TYPE > /tmp/blkid
+
# find pci aliases
aliases=$(find /sys/ -noleaf -name modalias -exec cat {} +)
@@ -212,7 +221,7 @@
grep "ata/" /tmp/modules-stripped| grep -v "pata" | grep -v "ata_generic" | grep -v "libata" >> /tmp/modules-sorted
grep "block/" /tmp/modules-stripped | grep "sx8" >> /tmp/modules-sorted
grep "net/" /tmp/modules-stripped | grep -v "wireless/" | grep -v "usb/" >> /tmp/modules-sorted
-grep "wireless/" /tmp/modules-stripped >> /tmp/modules-sorted
+grep "wireless/" /tmp/modules-stripped | grep "staging" >> /tmp/modules-sorted
grep "pcmcia/" /tmp/modules-stripped >> /tmp/modules-sorted
# speed up usb module loading
@@ -351,18 +360,23 @@
--show-sound) showlist "SOUND " $(listmods pcspkr) $(listmods sound/) ;;
--show-video) showlist "VIDEO " $(listmods video/) ;;
--show-other) showlist "OTHER " $(listmods .ko agp/ acpi/ ide/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 ata/ usb/ ieee1394 net/ isdn/ input/ irda/ pcmcia/ sound/ video/ firewire/ hid/) ;;
- --hostcontroller) showlist2 "MODULES" \"$(listmods ide/pci) $(listmods ata/pata) $(listmods ata/ata_generic) $(listmods scsi/ /sg.ko /st.ko sr_mod sd_mod) $(listmods message/fusion/) $(listmods drivers/block/ nbd pktcdvd sx8 floppy) $(listmods ata/ pata ata_generic) $(listmods drivers/block/sx8) $(listmods ehci-hcd) $(listmods uhci-hcd) $(listmods ohci-hcd)\" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
+ --filesystem) FILESYSTEM="ext2 ext3 ext4 reiserfs xfs jfs"
+ for i in $FILESYSTEM; do
+ [ "$(grep $i /tmp/blkid)" ] && FS="$FS $i"
+ done
+ ;;
+ --hostcontroller) showlist2 "MODULES" \"$(listmods ide/pci) $(listmods ata/pata) $(listmods ata/ata_generic) $(listmods scsi/ /sg.ko /st.ko scsi_mod sr_mod sd_mod) $(listmods message/fusion/) $(listmods drivers/block/ nbd pktcdvd sx8 floppy) $(listmods ata/ pata ata_generic) $(listmods drivers/block/sx8) $(listmods ehci-hcd) $(listmods uhci-hcd) $(listmods ohci-hcd) $FS\" | sed -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
;;
- --net) if [ "$(showlist2 "MODULES" \($(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/)\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' | grep '8139cp')" ] ; then
+ --net) if [ "$(showlist2 "MODULES" \($(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/) \) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g' | grep '8139cp')" ] ; then
if [ "$(dmesg | grep '"8139too"')" ]; then
- MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/)"
+ MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/)"
showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/8139cp//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
else
- MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/)"
+ MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/)"
showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/8139too//g' -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
fi
else
- MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/)"
+ MODULES_EXPORTED="$MODULES_EXPORTED $(listmods drivers/net/ irda ppp_generic slhc) $(listmods drivers/usb/net/) $(listmods drivers/staging/)"
showlist2 "MODULES" \($MODULES_EXPORTED\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
fi
;;
@@ -391,35 +405,22 @@
else
START_HOOKS=$(echo $START_HOOKS | sed -e "s/ide//g")
fi
- # usbinput, check for usbhid
- if ! [ "$(cat /proc/modules | grep usbhid)" ]; then
+ if ! [ "$USBINPUT" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/usbinput//g")
fi
- # keymap, check rc.conf for KEYMAP="us"
- if [ "$(grep '^KEYMAP="us"' /etc/rc.conf)" ]; then
- if ! [ "${KEYMAP}" = "1" ]; then
+ if ! [ "$KEYMAP" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/keymap//g")
- fi
fi
- ### TODO raid, check for presence of md devices in /dev
- #if ! [ "$(ls /dev/md* > /dev/null 2>&1 )" ]; then
- # START_HOOKS=$(echo $START_HOOKS | sed -e "s/raid//g")
- #fi
- if ! [ "$RAID" = "1" ] ; then
+ if ! [ "$RAID" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/\ raid\ //g")
fi
- if ! [ "$RAID_PARTITIONS" = "1" ] ; then
+ if ! [ "$RAID_PARTITIONS" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/raid-partitions\ //g")
fi
- if ! [ "$DMRAID" = "1" ] ; then
+ if ! [ "$DMRAID" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/dmraid//g")
fi
- ### TODO lvm2, encrypt check
- # encrypt, check for presence of mapper/root
- #if ! [ "$(ls /dev/mapper/root > /dev/null 2>&1 )" ]; then
- # START_HOOKS=$(echo $START_HOOKS | sed -e "s/encrypt//g")
- #fi
- if ! [ "$ENCRYPT" = "1" ] ; then
+ if ! [ "$ENCRYPT" = "1" ]; then
START_HOOKS=$(echo $START_HOOKS | sed -e "s/encrypt//g")
fi
if ! [ "$LVM2" = "1" ]; then
More information about the arch-commits
mailing list