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

[Tobias Powalowski]

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

Modified: PKGBUILD (1.144 -> 1.145) udev.rules (1.89 -> 1.90)

'upgpkg: update to new version'


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


Index: arch/build/base/udev/PKGBUILD
diff -u arch/build/base/udev/PKGBUILD:1.144 arch/build/base/udev/PKGBUILD:1.145
--- arch/build/base/udev/PKGBUILD:1.144	Wed Aug  1 17:15:59 2007
+++ arch/build/base/udev/PKGBUILD	Tue Aug  7 16:45:01 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.144 2007/08/01 21:15:59 tpowa Exp $
+# $Id: PKGBUILD,v 1.145 2007/08/07 20:45:01 tpowa Exp $
 # Maintainer: Judd Vinet <jvinet at zeroflux.org>
 pkgname=udev
-pkgver=113
-pkgrel=3
+pkgver=114
+pkgrel=1
 pkgdesc="The userspace dev tools (udev)"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -16,9 +16,9 @@
 source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2 \
         migrate-udev udev.rules start_udev load-modules.sh cdrom-rules.patch cdsymlinks.sh root-link.sh\
 	readme-udev-arch.txt)
-md5sums=('cb9a227206b9d85ae8cfc88fc51c1710'
+md5sums=('c597b3544e650560479edd13b5a5dc8a'
          '49434a593918c822077bc3af765f1aff'
-         '059d2e27eb519d050e4734f981783086'
+         'f1c75ac86d4d2af658b57479cb13c199'
          'a68a519d1ed8cbbd2f45c23eb32ea218'
          '592f2ba6323b66799f4954f1ed1ee93b'
          '12d3ab1283c56beb903afcab11789037'
@@ -60,3 +60,4 @@
   mv $startdir/pkg/etc/udev/rules.d/75-cd-aliases-generator.rules \
      $startdir/pkg/etc/udev/rules.d/75-cd-aliases-generator.rules.optional
 }
+
Index: arch/build/base/udev/udev.rules
diff -u arch/build/base/udev/udev.rules:1.89 arch/build/base/udev/udev.rules:1.90
--- arch/build/base/udev/udev.rules:1.89	Wed Aug  1 17:15:59 2007
+++ arch/build/base/udev/udev.rules	Tue Aug  7 16:45:01 2007
@@ -25,7 +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
 #####################################
@@ -38,7 +41,7 @@
 ACTION!="add", GOTO="hotplug_not_add_event"
 
 # Modaliases to load
-ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}"
+ENV{MODALIAS}=="?*", RUN{ignore_error}+="/lib/udev/load-modules.sh $env{MODALIAS}"
 
 # SCSI addon modules
 SUBSYSTEM=="scsi", ATTRS{type}=="[07]", RUN+="/lib/udev/load-modules.sh sd_mod"
@@ -47,7 +50,7 @@
 SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}!="ADR*", RUN+="/lib/udev/load-modules.sh osst"
 SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}=="Onstream", ATTRS{model}=="ADR*", RUN+="/lib/udev/load-modules.sh st"
 SUBSYSTEM=="scsi", ATTRS{type}=="1", ATTRS{vendor}!="Onstream", RUN+="/lib/udev/load-modules.sh st"
-SUBSYSTEM=="scsi", ATTRS{type}=="[235689]", RUN+="/lib/udev/load-modules.sh sg"
+SUBSYSTEM=="scsi", ATTRS{type}=="[235689]", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg"
 
 # load sg module for burners
 SUBSYSTEM=="block", ATTRS{type}=="[45]", RUN+="/lib/udev/load-modules.sh sg"
@@ -59,7 +62,7 @@
 DRIVERS=="?*", GOTO="hotplug_driver_loaded"
 
 # PNP modules
-SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN+="/bin/sh -c 'while read id; do /lib/udev/load-modules.sh pnp:d$$id; /lib/udev/load-modules.sh pnp:c$$id ; done < /sys$devpath/id'"
+SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", RUN{ignore_error}+="/bin/sh -c 'while read id; do /lib/udev/load-modules.sh pnp:d$$id; /lib/udev/load-modules.sh pnp:c$$id ; done < /sys$devpath/id'"
 
 # SOUND addon modules
 SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss"
@@ -292,7 +295,8 @@
 KERNEL=="capi*",		NAME="capi/%n"
 
 # Network devices
-KERNEL=="tun",		NAME="net/%k"
+KERNEL=="tun",		NAME="net/%k", OPTIONS+="ignore_remove"
+KERNEL=="ppp",          OPTIONS+="ignore_remove"
 
 # IEEE1394 (firewire) devices
 KERNEL=="raw1394", NAME="%k", GROUP="video"
@@ -310,8 +314,10 @@
 KERNEL=="pktcdvd[0-9]*",	NAME="pktcdvd/pktcdvd%n", GROUP="optical", MODE="0660"
 
 # usbfs-like device nodes, libusb device access
+# for kernel 2.6.21 and below
 SUBSYSTEM=="usb_device", ACTION=="add", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev};printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0664"
-
+# starting from kernel 2.6.22 use this rule
+SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0664" 
 #######################################
 # Permissions and Symlinks - end
 #######################################