Date: Tuesday, October 8, 2013 @ 19:39:26 Author: tpowa Revision: 196216
upgpkg: hwdetect 2013.10-4 add bluetooth Modified: hwdetect/trunk/PKGBUILD hwdetect/trunk/hwdetect ----------+ PKGBUILD | 4 +- hwdetect | 107 +++++++++++++++++++++++++++++++------------------------------ 2 files changed, 57 insertions(+), 54 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-08 16:59:27 UTC (rev 196215) +++ PKGBUILD 2013-10-08 17:39:26 UTC (rev 196216) @@ -2,7 +2,7 @@ # Maintainer: Tobias Powalowski <tp...@archlinux.org> pkgname=hwdetect pkgver=2013.10 -pkgrel=3 +pkgrel=4 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support" arch=(any) license=('GPL') @@ -16,4 +16,4 @@ package() { install -D -m 755 "${srcdir}/hwdetect" "${pkgdir}/usr/bin/hwdetect" } -md5sums=('93318a5c5487a9b7c454ea07013d9d46') +md5sums=('3f7825074b5adfa1abebe4e052b929c6') Modified: hwdetect =================================================================== --- hwdetect 2013-10-08 16:59:27 UTC (rev 196215) +++ hwdetect 2013-10-08 17:39:26 UTC (rev 196216) @@ -14,6 +14,7 @@ echo " --show-agp show AGP modules" echo " --show-acpi show ACPI modules" echo " --show-block show BLOCK DEVICE modules" + echo " --show-bluetooth show BLUETOOTH modules" echo " --show-cdrom show CDROM modules" echo " --show-cpufreq show CPUFREQ modules" echo " --show-crypto show CRYPTO modules" @@ -162,32 +163,33 @@ while [ -n "$*" ]; do case $1 in --show-modules) - showlist "AGP " $(listmods agp/) - showlist "ACPI " $(listmods acpi/) - showlist "BLOCK " $(listmods ata/pata pata_acpi) $(listmods ata/ata_piix) \ - $(listmods virtio/virtio_pci) $(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd pktcdvd sx8 floppy) \ - $(listmods ata/ pata ata_generic) $(listmods drivers/block/sx8) \ - $(listmods usb/ usb/input) $(listmods firewire/) $(listmods ieee1394/) - showlist "CDROM " $(listmods cdrom/) - showlist "CPUFREQ " $(listmods cpufreq/) - showlist "CRYPTO " $(listmods crypto/) - showlist "DRM " $(listmods drm/) - showlist "HWMON " $(listmods hwmon/) - showlist "I2C " $(listmods i2c/) - showlist "INPUT " $(listmods input/ pcspkr) $(listmods hid/) - showlist "IRDA " $(listmods irda/) - showlist "ISDN " $(listmods isdn/) - showlist "KVM " $(listmods kvm/) - showlist "MEDIA " $(listmods media/) - showlist "NET " $(listmods net/ irda/) - showlist "PARPORT " $(listmods parport/) - showlist "PCMCIA " $(listmods pcmcia/) - showlist "SOUND " $(listmods pcspkr) $(listmods sound/) - showlist "STAGING " $(listmods staging/) - showlist "TPM " $(listmods tpm/) - showlist "WATCHDOG" $(listmods watchdog/) - showlist "OTHER " $(listmods modules/ agp/ acpi/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 block/virtio virtio/virtio_pci ata/ \ - usb/ ieee1394 cdrom/ cpufreq/ crypto/ net/ hwmon/ i2c/ isdn/ input/ irda/ kvm/ media/ parport/ pcmcia/ sound/ tpm/ drm/ firewire/ hid/ staging/ watchdog/) + showlist "AGP " $(listmods agp/) + showlist "ACPI " $(listmods acpi/) + showlist "BLOCK " $(listmods ata/pata pata_acpi) $(listmods ata/ata_piix) \ + $(listmods virtio/virtio_pci) $(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd pktcdvd sx8 floppy) \ + $(listmods ata/ pata ata_generic) $(listmods drivers/block/sx8) \ + $(listmods usb/ usb/input) $(listmods firewire/) $(listmods ieee1394/) + showlist "BLUETOOTH" $(listmods bluetooth/) + showlist "CDROM " $(listmods cdrom/) + showlist "CPUFREQ " $(listmods cpufreq/) + showlist "CRYPTO " $(listmods crypto/) + showlist "DRM " $(listmods drm/) + showlist "HWMON " $(listmods hwmon/) + showlist "I2C " $(listmods i2c/) + showlist "INPUT " $(listmods input/ pcspkr) $(listmods hid/) + showlist "IRDA " $(listmods irda/) + showlist "ISDN " $(listmods isdn/) + showlist "KVM " $(listmods kvm/) + showlist "MEDIA " $(listmods media/) + showlist "NET " $(listmods net/ irda/) + showlist "PARPORT " $(listmods parport/) + showlist "PCMCIA " $(listmods pcmcia/) + showlist "SOUND " $(listmods pcspkr) $(listmods sound/) + showlist "STAGING " $(listmods staging/) + showlist "TPM " $(listmods tpm/) + showlist "WATCHDOG " $(listmods watchdog/) + showlist "OTHER " $(listmods modules/ agp/ acpi/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 block/virtio virtio/virtio_pci ata/ \ + usb/ ieee1394 bluetooth/ cdrom/ cpufreq/ crypto/ net/ hwmon/ i2c/ isdn/ input/ irda/ kvm/ media/ parport/ pcmcia/ sound/ tpm/ drm/ firewire/ hid/ staging/ watchdog/) ;; --show-modules-order) @@ -194,32 +196,33 @@ showlist "MODULES ORDER" $(listmods modules/) ;; - --show-agp) showlist "AGP " $(listmods agp/) ;; - --show-acpi) showlist "ACPI " $(listmods acpi/) ;; - --show-block) showlist "BLOCK " $(listmods ata/pata pata_acpi) $(listmods ata/ata_piix) \ - $(listmods virtio/virtio_pci) $(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd pktcdvd sx8 floppy) \ - $(listmods ata/ pata ata_generic) $(listmods drivers/block/sx8) \ - $(listmods usb/ usb/input) $(listmods firewire/) $(listmods ieee1394/) ;; - --show-cdrom) showlist "CDROM " $(listmods cdrom/) ;; - --show-cpufreq) showlist "CPUFREQ " $(listmods cpufreq/) ;; - --show-crypto) showlist "CRYPTO " $(listmods crypto/) ;; - --show-drm) showlist "DRM " $(listmods drm/) ;; - --show-hwmon) showlist "HWMON " $(listmods hwmon/) ;; - --show-input) showlist "INPUT " $(listmods input/ pcspkr) $(listmods hid/) ;; - --show-i2c) showlist "I2C " $(listmods i2c/) ;; - --show-irda) showlist "IRDA " $(listmods irda/) ;; - --show-isdn) showlist "ISDN " $(listmods isdn/) ;; - --show-kvm) showlist "KVM " $(listmods kvm/) ;; - --show-media) showlist "MEDIA " $(listmods media/) ;; - --show-net) showlist "NET " $(listmods net/ irda/) ;; - --show-parport) showlist "PARPORT " $(listmods parport/) ;; - --show-pcmcia) showlist "PCMCIA " $(listmods pcmcia/) ;; - --show-sound) showlist "SOUND " $(listmods pcspkr) $(listmods sound/) ;; - --show-staging) showlist "STAGING " $(listmods staging/) ;; - --show-tpm) showlist "TPM " $(listmods tpm/) ;; - --show-watchdog) showlist "WATCHDOG" $(listmods watchdog/) ;; - --show-other) showlist "OTHER " $(listmods .ko agp/ acpi/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 block/virtio virtio/virtio_pci ata/ \ - usb/ ieee1394 cdrom/ cpufreq/ crypto/ net/ hwmon/ i2c/ isdn/ input/ irda/ kvm/ media/ parport/ pcmcia/ sound/ tpm/ drm/ firewire/ hid/ staging/ watchdog/) ;; + --show-agp) showlist "AGP " $(listmods agp/) ;; + --show-acpi) showlist "ACPI " $(listmods acpi/) ;; + --show-block) showlist "BLOCK " $(listmods ata/pata pata_acpi) $(listmods ata/ata_piix) \ + $(listmods virtio/virtio_pci) $(listmods scsi/) $(listmods message/fusion/) $(listmods drivers/block/ nbd pktcdvd sx8 floppy) \ + $(listmods ata/ pata ata_generic) $(listmods drivers/block/sx8) \ + $(listmods usb/ usb/input) $(listmods firewire/) $(listmods ieee1394/) ;; + --show-bluetooth) showlist "BLUETOOTH" $(listmods bluetooth/) ;; + --show-cdrom) showlist "CDROM " $(listmods cdrom/) ;; + --show-cpufreq) showlist "CPUFREQ " $(listmods cpufreq/) ;; + --show-crypto) showlist "CRYPTO " $(listmods crypto/) ;; + --show-drm) showlist "DRM " $(listmods drm/) ;; + --show-hwmon) showlist "HWMON " $(listmods hwmon/) ;; + --show-input) showlist "INPUT " $(listmods input/ pcspkr) $(listmods hid/) ;; + --show-i2c) showlist "I2C " $(listmods i2c/) ;; + --show-irda) showlist "IRDA " $(listmods irda/) ;; + --show-isdn) showlist "ISDN " $(listmods isdn/) ;; + --show-kvm) showlist "KVM " $(listmods kvm/) ;; + --show-media) showlist "MEDIA " $(listmods media/) ;; + --show-net) showlist "NET " $(listmods net/ irda/) ;; + --show-parport) showlist "PARPORT " $(listmods parport/) ;; + --show-pcmcia) showlist "PCMCIA " $(listmods pcmcia/) ;; + --show-sound) showlist "SOUND " $(listmods pcspkr) $(listmods sound/) ;; + --show-staging) showlist "STAGING " $(listmods staging/) ;; + --show-tpm) showlist "TPM " $(listmods tpm/) ;; + --show-watchdog) showlist "WATCHDOG " $(listmods watchdog/) ;; + --show-other) showlist "OTHER " $(listmods .ko agp/ acpi/ scsi/ message/fusion block/sx8 block/cciss block/cpqarray block/DAC960 block/virtio virtio/virtio_pci ata/ \ + usb/ ieee1394 bluetooth/ cpufreq/ crypto/ net/ hwmon/ i2c/ isdn/ input/ irda/ kvm/ media/ parport/ pcmcia/ sound/ tpm/ drm/ firewire/ hid/ staging/ watchdog/) ;; --filesystem) FILESYSTEM="ext2 ext3 ext4 f2fs nilfs2 btrfs reiserfs xfs jfs vfat" for i in $FILESYSTEM; do [ "$(grep $i /tmp/.blkid)" ] && FS="$FS $i"