[arch-commits] CVS update of arch/build/base/klibc-udev (PKGBUILD udev.rules)
Tobias Powalowski
tpowa at archlinux.org
Wed May 2 18:26:40 UTC 2007
Date: Wednesday, May 2, 2007 @ 14:26:40
Author: tpowa
Path: /home/cvs-arch/arch/build/base/klibc-udev
Modified: PKGBUILD (1.22 -> 1.23) udev.rules (1.13 -> 1.14)
'upgpkg: update to new version, updated persistent disk rules'
------------+
PKGBUILD | 10 ++++-----
udev.rules | 62 ++++++++++++++++++++++++++++++++++++++---------------------
2 files changed, 45 insertions(+), 27 deletions(-)
Index: arch/build/base/klibc-udev/PKGBUILD
diff -u arch/build/base/klibc-udev/PKGBUILD:1.22 arch/build/base/klibc-udev/PKGBUILD:1.23
--- arch/build/base/klibc-udev/PKGBUILD:1.22 Sun Apr 29 06:03:59 2007
+++ arch/build/base/klibc-udev/PKGBUILD Wed May 2 14:26:40 2007
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD,v 1.22 2007/04/29 10:03:59 tpowa Exp $
+#$Id: PKGBUILD,v 1.23 2007/05/02 18:26:40 tpowa Exp $
#Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=klibc-udev
-pkgver=109
-pkgrel=2
+pkgver=110
+pkgrel=1
pkgdesc="udevd compiled under klibc"
arch=(i686 x86_64)
url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -11,9 +11,9 @@
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 post-107.patch)
-md5sums=('6fd1ed31f48d7e99c549a132974a34c0' 'bcfed63882660e7d33f367d722e0a5c9'\
+md5sums=('34c703949f7c22745f52ef5a56d5910c' 'bcfed63882660e7d33f367d722e0a5c9'\
'44747726599e90a2fa3db474bfc57a0e' '22741baf8f5d7d8bc88022b39bca74d8'\
- '8677fda9ee40508841b4136d252f8587' '90f4335cc6fd01b554b453e842ff212f'\
+ 'e69683265e6774a44558690c98937c5f' '90f4335cc6fd01b554b453e842ff212f'\
'80f75fc9a8fc32c7b8ff146d53bf579f' 'd3b6ac926fb7b3c34d202c1deafd9f1d')
build()
Index: arch/build/base/klibc-udev/udev.rules
diff -u arch/build/base/klibc-udev/udev.rules:1.13 arch/build/base/klibc-udev/udev.rules:1.14
--- arch/build/base/klibc-udev/udev.rules:1.13 Sun Apr 29 06:03:59 2007
+++ arch/build/base/klibc-udev/udev.rules Wed May 2 14:26:40 2007
@@ -101,18 +101,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]", ATTRS{removable}=="1", DRIVERS=="ide-cs", GOTO="persistent_end"
-KERNEL=="hd*[!0-9]", ATTRS{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_*"
@@ -126,37 +133,48 @@
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)
### Broken at the moment
-#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
#####################################
More information about the arch-commits
mailing list