[arch-commits] Commit in hwdetect/repos (3 files)

[Tobias Powalowski]

    Date: Thursday, January 1, 2009 @ 06:35:00
  Author: tpowa
Revision: 23015

Merged revisions 23014 via svnmerge from 
svn+ssh://svn.archlinux.org/srv/svn-packages/hwdetect/trunk

........
  r23014 | tpowa | 2009-01-01 11:34:25 +0000 (Do, 01 Jan 2009) | 1 line
  
  upgpkg: hwdetect 2008.12-4
........

Modified:
  hwdetect/repos/extra-x86_64/	(properties)
  hwdetect/repos/extra-x86_64/PKGBUILD
  hwdetect/repos/extra-x86_64/hwdetect

----------+
 PKGBUILD |    4 ++--
 hwdetect |    6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)


Property changes on: hwdetect/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /hwdetect/trunk:1-22845
   + /hwdetect/trunk:1-23014

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2009-01-01 11:34:25 UTC (rev 23014)
+++ extra-x86_64/PKGBUILD	2009-01-01 11:35:00 UTC (rev 23015)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
 pkgver=2008.12
-pkgrel=3
+pkgrel=4
 pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
 arch=(i686 x86_64)
 license=('GPL')
@@ -12,4 +12,4 @@
 build() {
   install -D -m 755 $startdir/src/hwdetect $startdir/pkg/sbin/hwdetect
 }
-md5sums=('7496ba5c5043e0e43557a5ee08500b92')
+md5sums=('a1c1e79149369bf492a75ae0746a7f84')

Modified: extra-x86_64/hwdetect
===================================================================
--- extra-x86_64/hwdetect	2009-01-01 11:34:25 UTC (rev 23014)
+++ extra-x86_64/hwdetect	2009-01-01 11:35:00 UTC (rev 23015)
@@ -126,10 +126,10 @@
 : >/tmp/modules-stripped
 : >/tmp/modules-sorted
 : >/tmp/moduleslist
-: >/tmp/blkid
+: >/tmp/.blkid
 
 # generate blkid
-blkid -c /dev/null -s TYPE > /tmp/blkid
+/sbin/blkid -c /dev/null -s TYPE > /tmp/.blkid
 
 # find pci aliases
 aliases=$(find /sys/ -noleaf -name modalias  -exec cat {} +)
@@ -362,7 +362,7 @@
 		--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/) ;;
 		--filesystem) FILESYSTEM="ext2 ext3 ext4 reiserfs xfs jfs"
 				  for i in $FILESYSTEM; do
-					 [ "$(grep $i /tmp/blkid)" ] && FS="$FS $i"
+					 [ "$(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'