[arch-commits] CVS update of arch/build/base/udev (PKGBUILD udev.rules)
Tobias Powalowski
tpowa at archlinux.org
Sat May 5 15:18:21 UTC 2007
Date: Saturday, May 5, 2007 @ 11:18:21
Author: tpowa
Path: /home/cvs-arch/arch/build/base/udev
Modified: PKGBUILD (1.136 -> 1.137) udev.rules (1.85 -> 1.86)
'upgpkg: fixed again persistent block'
------------+
PKGBUILD | 6 +++---
udev.rules | 24 +++++++++++++-----------
2 files changed, 16 insertions(+), 14 deletions(-)
Index: arch/build/base/udev/PKGBUILD
diff -u arch/build/base/udev/PKGBUILD:1.136 arch/build/base/udev/PKGBUILD:1.137
--- arch/build/base/udev/PKGBUILD:1.136 Thu May 3 14:10:52 2007
+++ arch/build/base/udev/PKGBUILD Sat May 5 11:18:21 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.136 2007/05/03 18:10:52 tpowa Exp $
+# $Id: PKGBUILD,v 1.137 2007/05/05 15:18:21 tpowa Exp $
# Maintainer: Judd Vinet <jvinet at zeroflux.org>
pkgname=udev
pkgver=110
-pkgrel=2
+pkgrel=3
pkgdesc="The userspace dev tools (udev)"
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -16,7 +16,7 @@
migrate-udev udev.rules start_udev load-modules.sh cdrom-rules.patch cdsymlinks.sh root-link.sh\
readme-udev-arch.txt)
md5sums=('34c703949f7c22745f52ef5a56d5910c' '49434a593918c822077bc3af765f1aff'\
- '8d69f50782360f66ac264523b68dfacc' 'a68a519d1ed8cbbd2f45c23eb32ea218'\
+ '15f58c3928d959c29fb7528f124ffe03' 'a68a519d1ed8cbbd2f45c23eb32ea218'\
'592f2ba6323b66799f4954f1ed1ee93b' '12d3ab1283c56beb903afcab11789037'\
'8424b78e9dd772e75b4ef90814807815' '2d6dc6842464f107bccc68cd505a6c31'\
'f01c60661e4b32ca7c7f905c1e194a52')
Index: arch/build/base/udev/udev.rules
diff -u arch/build/base/udev/udev.rules:1.85 arch/build/base/udev/udev.rules:1.86
--- arch/build/base/udev/udev.rules:1.85 Thu May 3 14:10:52 2007
+++ arch/build/base/udev/udev.rules Sat May 5 11:18:21 2007
@@ -322,21 +322,23 @@
# persistent storage links: /dev/{disk,tape}/{by-id,by-uuid,by-label,by-path,by-name}
# scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare at suse.de>
-ACTION!="add", GOTO="persistent_storage_end"
+# needed like this!!!
+ACTION!="add|change", GOTO="persistent_storage_end"
-KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -s %p -d $tempnode"
-KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -a -s %p -d $tempnode"
+KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
+KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
KERNEL=="nst[0-9]", SUBSYSTEMS=="scsi", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}-nst"
# type 8 devices are "Medium Changers"
-KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -s %p -d $tempnode"
-KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -a -s %p -d $tempnode"
+KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
+KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
KERNEL=="sg*", SUBSYSTEMS=="scsi", ATTRS{type}=="8", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
SUBSYSTEM!="block", GOTO="persistent_storage_end"
# skip rules for inappropriate block devices
-KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|md*", GOTO="persistent_storage_end"
+# don't add dm-*!!!
+KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|md*", GOTO="persistent_storage_end"
# never access non-cdrom removable ide devices, the drivers are causing event loops on open()
KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
@@ -358,7 +360,7 @@
KERNEL=="sd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}-part%n"
# libata compat (links like hd*)
-KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="ata_id $tempnode", ENV{ID_ATA_COMPAT}="$result"
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="/lib/udev/ata_id $tempnode", ENV{ID_ATA_COMPAT}="$result"
KERNEL=="sd*[!0-9]|sr*", ENV{ID_ATA_COMPAT}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}"
KERNEL=="sd*[0-9]", ENV{ID_ATA_COMPAT}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_ATA_COMPAT}-part%n"
@@ -367,13 +369,13 @@
# by-path (shortest physical path)
KERNEL=="*[!0-9]|sr*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
-KERNEL=="st*", IMPORT{program}="path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}"
+KERNEL=="st*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="tape/by-path/$env{ID_PATH}"
KERNEL=="sr*|st*", GOTO="persistent_storage_end"
KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
# by-label/by-uuid (filesystem properties)
KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
-IMPORT{program}="vol_id --export $tempnode"
+IMPORT{program}="/lib/udev/vol_id --export $tempnode"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
@@ -389,7 +391,7 @@
ACTION!="add|change", GOTO="md_end"
ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
-IMPORT{program}="vol_id --export $tempnode"
+IMPORT{program}="/lib/udev/vol_id --export $tempnode"
OPTIONS="link_priority=100"
ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_SAFE}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
@@ -407,7 +409,7 @@
KERNEL=="input[0-9]*", GOTO="persistent_input_end"
# usb devices
-SUBSYSTEMS=="usb", IMPORT{program}="usb_id -x"
+SUBSYSTEMS=="usb", IMPORT{program}="/lib/udev/usb_id -x"
SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="01", ENV{ID_CLASS}="kbd"
SUBSYSTEMS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="02", ENV{ID_CLASS}="mouse"
More information about the arch-commits
mailing list