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

Tobias Powalowski tpowa at archlinux.org
Thu Jun 7 04:57:13 EDT 2007


    Date: Thursday, June 7, 2007 @ 04:57:13
  Author: tpowa
    Path: /home/cvs-arch/arch/build/base/klibc-udev

Modified: PKGBUILD (1.27 -> 1.28) udev.rules (1.16 -> 1.17)

'upgpkg: update to new version'


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


Index: arch/build/base/klibc-udev/PKGBUILD
diff -u arch/build/base/klibc-udev/PKGBUILD:1.27 arch/build/base/klibc-udev/PKGBUILD:1.28
--- arch/build/base/klibc-udev/PKGBUILD:1.27	Tue May 15 12:46:20 2007
+++ arch/build/base/klibc-udev/PKGBUILD	Thu Jun  7 04:57:13 2007
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD,v 1.27 2007/05/15 16:46:20 tpowa Exp $
+#$Id: PKGBUILD,v 1.28 2007/06/07 08:57:13 tpowa Exp $
 #Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=klibc-udev
-pkgver=111
-pkgrel=3
+pkgver=112
+pkgrel=1
 pkgdesc="udevd compiled under klibc"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -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 post-107.patch)
-md5sums=('bd2a94e3ed243e6a3d501a5c8afc4b54'
+md5sums=('89448564541dec05cfbe4176048f2886'
          'bcfed63882660e7d33f367d722e0a5c9'
          '44747726599e90a2fa3db474bfc57a0e'
          '22741baf8f5d7d8bc88022b39bca74d8'
-         '9ebb638935ae7e2bc53eb22219d1eb15'
+         '4f2306ff6901bb2ab0af440a5277b89c'
          '1ecfeec15e88485e88f2e37f46861f2e'
          '80f75fc9a8fc32c7b8ff146d53bf579f'
          'd3b6ac926fb7b3c34d202c1deafd9f1d')
Index: arch/build/base/klibc-udev/udev.rules
diff -u arch/build/base/klibc-udev/udev.rules:1.16 arch/build/base/klibc-udev/udev.rules:1.17
--- arch/build/base/klibc-udev/udev.rules:1.16	Tue May 15 12:46:20 2007
+++ arch/build/base/klibc-udev/udev.rules	Thu Jun  7 04:57:13 2007
@@ -104,13 +104,11 @@
 # needed like this !!!
 ACTION!="add|change", GOTO="persistent_storage_end"
 
-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}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -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}="/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}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -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"
@@ -123,6 +121,9 @@
 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"
 
+# ignore partitions that span the entire disk
+ATTR{whole_disk}=="", GOTO="persistent_storage_end"
+
 # for partitions import parent information
 KERNEL=="*[0-9]", IMPORT{parent}="ID_*"
 
@@ -132,11 +133,11 @@
 KERNEL=="hd*[0-9]", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
 
 KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_SUBSYSTEMS}="ieee1394"
-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*", 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"
+KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/usb_id --export"
+KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --fallback-to-sysfs -s %p -d $tempnode"
+KERNEL=="cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="", IMPORT{program}="/lib/udev/scsi_id --export --whitelisted --ignore-sysfs -s %p -d $tempnode", ENV{ID_BUS}="cciss"
+KERNEL=="sd*[!0-9]|sr*|cciss?c[0-9]d[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
+KERNEL=="sd*[0-9]|cciss*p[0-9]", ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
 
 # libata compat (links like hd*)
 KERNEL=="sd*[!0-9]|sr*", ENV{ID_VENDOR}=="ATA", PROGRAM="/lib/udev/ata_id $tempnode", ENV{ID_ATA_COMPAT}="$result"
@@ -156,8 +157,8 @@
 # by-label/by-uuid (filesystem properties)
 KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="persistent_storage_end"
 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}"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
 
 # BIOS Enhanced Disk Device
 KERNEL=="*[!0-9]", IMPORT{program}="/lib/udev/edd_id --export $tempnode"
@@ -173,8 +174,8 @@
 ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
 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}"
+ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
+ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}""
  
 LABEL="md_end"
 #####################################




More information about the arch-commits mailing list