[arch-commits] CVS update of arch/build/base/klibc-udev (PKGBUILD udev.rules)

[Tobias Powalowski]

    Date: Tuesday, August 7, 2007 @ 16:45:48
  Author: tpowa
    Path: /home/cvs-arch/arch/build/base/klibc-udev

Modified: PKGBUILD (1.29 -> 1.30) udev.rules (1.18 -> 1.19)

'upgpkg: update to new version'


------------+
 PKGBUILD   |    9 +++++----
 udev.rules |    8 ++++++--
 2 files changed, 11 insertions(+), 6 deletions(-)


Index: arch/build/base/klibc-udev/PKGBUILD
diff -u arch/build/base/klibc-udev/PKGBUILD:1.29 arch/build/base/klibc-udev/PKGBUILD:1.30
--- arch/build/base/klibc-udev/PKGBUILD:1.29	Sun Jun 24 05:57:29 2007
+++ arch/build/base/klibc-udev/PKGBUILD	Tue Aug  7 16:45:48 2007
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD,v 1.29 2007/06/24 09:57:29 tpowa Exp $
+#$Id: PKGBUILD,v 1.30 2007/08/07 20:45:48 tpowa Exp $
 #Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=klibc-udev
-pkgver=113
+pkgver=114
 pkgrel=1
 pkgdesc="udevd compiled under klibc"
 arch=(i686 x86_64)
@@ -12,11 +12,11 @@
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev-$pkgver.tar.bz2 \
         udev_hook udev_install start_udev udev.rules load-modules.sh \
         vol_id-suspend2.patch)
-md5sums=('cb9a227206b9d85ae8cfc88fc51c1710'
+md5sums=('c597b3544e650560479edd13b5a5dc8a'
          'bcfed63882660e7d33f367d722e0a5c9'
          '44747726599e90a2fa3db474bfc57a0e'
          '22741baf8f5d7d8bc88022b39bca74d8'
-         '749b35b54a83ef2ca5a53b9b314df71a'
+         '37098e09b8f7b1877467089ef1a21ec2'
          '1ecfeec15e88485e88f2e37f46861f2e'
          '80f75fc9a8fc32c7b8ff146d53bf579f')
 
@@ -55,3 +55,4 @@
   mkdir -p $startdir/pkg/lib/initcpio/hooks/
   install -m644 $startdir/src/udev_hook $startdir/pkg/lib/initcpio/hooks/udev  
 }
+
Index: arch/build/base/klibc-udev/udev.rules
diff -u arch/build/base/klibc-udev/udev.rules:1.18 arch/build/base/klibc-udev/udev.rules:1.19
--- arch/build/base/klibc-udev/udev.rules:1.18	Sun Jun 24 05:57:29 2007
+++ arch/build/base/klibc-udev/udev.rules	Tue Aug  7 16:45:48 2007
@@ -25,6 +25,10 @@
 #####################################
 # wait for sysfs
 ACTION=="add", KERNEL=="[0-9]*:[0-9]*", SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt"
+# Setting timeout for tape-devices (type 1) to 900 seconds
+# and 60 seconds for device types 0, 7 and 14
+SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
+SUBSYSTEM=="scsi", KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900"
 #####################################
 # Early rules -end
 #####################################
@@ -34,7 +38,7 @@
 #####################################
 
 # Modaliases to load
-ACTION=="add", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
+ACTION=="add", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
 # SCSI addon modules
 ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[07]", RUN+="/lib/udev/load-modules.sh sd_mod"
 ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="14", RUN+="/lib/udev/load-modules.sh sd_mod"
@@ -42,7 +46,7 @@
 ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}!="ADR*", RUN+="/lib/udev/load-modules.sh osst"
 ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}=="ADR*", RUN+="/lib/udev/load-modules.sh st"
 ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}!="Onstream", RUN+="/lib/udev/load-modules.sh st"
-ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[23689]", RUN+="/lib/udev/load-modules.sh sg"
+ACTION=="add", SUBSYSTEM=="scsi", ATTRS{type}=="[23689]", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
 ACTION=="add", SUBSYSTEM=="mmc", RUN+="/lib/udev/load-modules.sh mmc_block"
 
 LABEL="hotplug_driver_loaded"