Date: Monday, October 7, 2013 @ 22:46:43 Author: tpowa Revision: 196175
upgpkg: hwdetect 2013.10-1 add more output options Modified: hwdetect/trunk/PKGBUILD hwdetect/trunk/hwdetect ----------+ PKGBUILD | 6 +-- hwdetect | 98 ++++++++++++++++++++++++++++++++++++++++--------------------- 2 files changed, 68 insertions(+), 36 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-10-07 19:32:33 UTC (rev 196174) +++ PKGBUILD 2013-10-07 20:46:43 UTC (rev 196175) @@ -1,8 +1,8 @@ # $Id$ # Maintainer: Tobias Powalowski <[email protected]> pkgname=hwdetect -pkgver=2013.08 -pkgrel=2 +pkgver=2013.10 +pkgrel=1 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=('1ffabf5db0f3b98336045a5ba1580454') +md5sums=('f17349465e2d5b2133d78d621988b31e') Modified: hwdetect =================================================================== --- hwdetect 2013-10-07 19:32:33 UTC (rev 196174) +++ hwdetect 2013-10-07 20:46:43 UTC (rev 196175) @@ -16,14 +16,24 @@ echo " --show-agp show AGP modules" echo " --show-acpi show ACPI modules" echo " --show-block show BLOCK DEVICE modules" - echo " --show-net show NETWORK modules" - echo " --show-drm show DRM modules" + echo " --show-cdrom show CDROM modules" + echo " --show-cpufreq show CPUFREQ modules" + echo " --show-crypto show CRYPTO modules" + echo " --show-drm show DRM modules" + echo " --show-hwmon show HWMON modules" + echo " --show-i2c show I2C modules" echo " --show-input show INPUT modules" echo " --show-irda show IRDA modules" echo " --show-isdn show ISDN modules" - echo " --show-pcmcia show PCMCIA modules" + echo " --show-kvm show KVM modules" + echo " --show-media show MEDIA modules" + echo " --show-net show NETWORK modules" + echo " --show-parport show PARPORT modules" + echo " --show-pcmcia show PCMCIA modules" echo " --show-sound show SOUND modules" echo " --show-staging show STAGING modules" + echo " --show-tpm show TPM modules" + echo " --show-watchdog show WATCHDOG modules" echo " --show-other show OTHER modules" echo "" echo " For /etc/mkinitcpio.conf use:" @@ -247,21 +257,32 @@ ;; --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 "NET " $(listmods net/ irda/) - showlist "DRM " $(listmods drm/) - showlist "INPUT " $(listmods input/ pcspkr) $(listmods hid/) - showlist "IRDA " $(listmods irda/) - showlist "ISDN " $(listmods isdn/) - showlist "PCMCIA " $(listmods pcmcia/) - showlist "SOUND " $(listmods pcspkr) $(listmods sound/) - showlist "STAGING" $(listmods staging/) - 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 net/ isdn/ input/ irda/ pcmcia/ sound/ drm/ firewire/ hid/ staging/) + 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/) ;; --show-modules-order) @@ -268,21 +289,32 @@ 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-net) showlist "NET " $(listmods net/ irda/) ;; - --show-input) showlist "INPUT " $(listmods input/ pcspkr) $(listmods hid/) ;; - --show-irda) showlist "IRDA " $(listmods irda/) ;; - --show-isdn) showlist "ISDN " $(listmods isdn/) ;; - --show-pcmcia) showlist "PCMCIA " $(listmods pcmcia/) ;; - --show-sound) showlist "SOUND " $(listmods pcspkr) $(listmods sound/) ;; - --show-staging) showlist "STAGING" $(listmods staging/) ;; - --show-drm) showlist "DRM " $(listmods drm/) ;; - --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 net/ isdn/ input/ irda/ pcmcia/ sound/ drm/ firewire/ hid/ staging/) ;; + --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/) ;; --filesystem) FILESYSTEM="ext2 ext3 ext4 f2fs nilfs2 btrfs reiserfs xfs jfs vfat" for i in $FILESYSTEM; do [ "$(grep $i /tmp/.blkid)" ] && FS="$FS $i"
