[arch-commits] CVS update of arch/build/base/udev (PKGBUILD udev.rules)
Tobias Powalowski
tpowa at archlinux.org
Wed May 2 18:25:23 UTC 2007
Date: Wednesday, May 2, 2007 @ 14:25:23
Author: tpowa
Path: /home/cvs-arch/arch/build/base/udev
Modified: PKGBUILD (1.134 -> 1.135) udev.rules (1.83 -> 1.84)
'upgpkg: update to new version, updated persistent disk rules'
------------+
PKGBUILD | 11 ++++-----
udev.rules | 66 +++++++++++++++++++++++++++++++++++++----------------------
2 files changed, 47 insertions(+), 30 deletions(-)
Index: arch/build/base/udev/PKGBUILD
diff -u arch/build/base/udev/PKGBUILD:1.134 arch/build/base/udev/PKGBUILD:1.135
--- arch/build/base/udev/PKGBUILD:1.134 Sun Apr 29 06:02:55 2007
+++ arch/build/base/udev/PKGBUILD Wed May 2 14:25:23 2007
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD,v 1.134 2007/04/29 10:02:55 tpowa Exp $
+# $Id: PKGBUILD,v 1.135 2007/05/02 18:25:23 tpowa Exp $
# Maintainer: Judd Vinet <jvinet at zeroflux.org>
pkgname=udev
-pkgver=109
-pkgrel=2
+pkgver=110
+pkgrel=1
pkgdesc="The userspace dev tools (udev)"
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -15,8 +15,8 @@
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=('6fd1ed31f48d7e99c549a132974a34c0' '49434a593918c822077bc3af765f1aff'\
- 'b45c47054c69a41149da22b9ada14c13' 'a68a519d1ed8cbbd2f45c23eb32ea218'\
+md5sums=('34c703949f7c22745f52ef5a56d5910c' '49434a593918c822077bc3af765f1aff'\
+ 'cc70592d9e112ec131f490b1c516de77' 'a68a519d1ed8cbbd2f45c23eb32ea218'\
'592f2ba6323b66799f4954f1ed1ee93b' '12d3ab1283c56beb903afcab11789037'\
'8424b78e9dd772e75b4ef90814807815' '2d6dc6842464f107bccc68cd505a6c31'\
'f01c60661e4b32ca7c7f905c1e194a52')
@@ -56,4 +56,3 @@
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.83 arch/build/base/udev/udev.rules:1.84
--- arch/build/base/udev/udev.rules:1.83 Sun Apr 29 06:02:55 2007
+++ arch/build/base/udev/udev.rules Wed May 2 14:25:23 2007
@@ -71,6 +71,7 @@
ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr"
# not needed anymore with kernel >= 2.6.21
#ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0b00", RUN+="/lib/udev/load-modules.sh rtc"
+ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0b00", RUN+="/lib/udev/load-modules.sh rtc_dev"
ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP0510*", RUN+="/lib/udev/load-modules.sh irtty-sir"
ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP0511*", RUN+="/lib/udev/load-modules.sh irtty-sir"
ACTION=="add", SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog"
@@ -318,18 +319,25 @@
# 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|change", SUBSYSTEM=="block", GOTO="persistent_do"
-GOTO="persistent_end"
-LABEL="persistent_do"
+ACTION!="add", 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}=="?*", 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}=="?*", 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*|md*", GOTO="persistent_end"
+KERNEL=="ram*|loop*|fd*|nbd*|gnbd*|dm-*|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", GOTO="persistent_end"
-KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-floppy", GOTO="persistent_end"
-KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_end"
+KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
+KERNEL=="hd*[0-9]", ATTRS{removable}=="1", GOTO="persistent_storage_end"
# for partitions import parent information
KERNEL=="*[0-9]", IMPORT{parent}="ID_*"
@@ -343,37 +351,47 @@
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id -x"
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -s %p -d $tempnode"
KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id -g -x -a -s %p -d $tempnode"
-KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}"
-KERNEL=="sd*[0-9]|dasd*[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}-part%n"
-KERNEL=="st*", ENV{ID_SERIAL}=="?*", SYMLINK+="tape/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}"
-KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}"
-KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
+KERNEL=="sd*[!0-9]|sr*", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}"
+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_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"
+KERNEL=="mmcblk[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}"
+KERNEL=="mmcblk[0-9]p[0-9]", ATTR{name}=="?*", ATTR{serial}=="?*", ENV{ID_NAME}="$attr{name}", ENV{ID_SERIAL}="$attr{serial}", SYMLINK+="disk/by-id/mmc-$env{ID_NAME}_$env{ID_SERIAL}-part%n"
+
# by-path (shortest physical path)
-KERNEL=="*[!0-9]|sr*|st*", ENV{ID_TYPE}=="?*", IMPORT{program}="/lib/udev/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
-KERNEL=="st*", ENV{ID_PATH}=="?*", SYMLINK+="tape/by-path/$env{ID_PATH}"
-KERNEL=="sr*|st*", GOTO="persistent_end"
-KERNEL=="*[0-9]", IMPORT{parent}=="ID_*"
+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=="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_end"
-IMPORT{program}="/lib/udev/vol_id --export $tempnode"
-ENV{ID_FS_UUID}=="?*", ENV{ID_FS_USAGE}=="filesystem|other|crypto", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
-ENV{ID_FS_LABEL_SAFE}=="?*", ENV{ID_FS_USAGE}=="filesystem|other", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
+KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
+IMPORT{program}="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}"
# BIOS Enhanced Disk Device
KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode"
KERNEL=="*[!0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}"
KERNEL=="*[0-9]", ENV{ID_EDD}=="?*", SYMLINK+="disk/by-id/edd-$env{ID_EDD}-part%n"
-LABEL="persistent_end"
-#####################################
+LABEL="persistent_storage_end"
+
+# md links hook into "change" events, when the array becomes available
+KERNEL!="md[0-9]*", GOTO="md_end"
+ACTION!="add|change", GOTO="md_end"
+
+ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
+IMPORT{program}="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}"
+
+LABEL="md_end"
# Persistant block device stuff - end
#####################################
@@ -398,7 +416,7 @@
ATTRS{modalias}=="input:*-*a[068],*|input:*-*a*,[68],*m*", ATTRS{modalias}!="input:*-*k*14A,*r*", ENV{ID_CLASS}="joystick"
# fill empty serial number
-+ENV{ID_CLASS}=="?*", ENV{ID_SERIAL}=="", ENV{ID_SERIAL}="noserial"
+ENV{ID_CLASS}=="?*", ENV{ID_SERIAL}=="", ENV{ID_SERIAL}="noserial"
# by-id links, generic and for the event devices
KERNEL=="mouse*|js*", ENV{ID_SUBSYSTEMS}=="?*", ENV{ID_SERIAL}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_SUBSYSTEMS}-$env{ID_SERIAL}-$env{ID_CLASS}"
More information about the arch-commits
mailing list