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

Sat May 5 15:19:34 UTC 2007

Date: Saturday, May 5, 2007 @ 11:19:34
  Author: tpowa
    Path: /home/cvs-arch/arch/build/base/klibc-udev

Modified: PKGBUILD (1.23 -> 1.24) udev.rules (1.14 -> 1.15)

'upgpkg: fixed again persistent block'


------------+
 PKGBUILD   |    6 +++---
 udev.rules |   22 ++++++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)


Index: arch/build/base/klibc-udev/PKGBUILD
diff -u arch/build/base/klibc-udev/PKGBUILD:1.23 arch/build/base/klibc-udev/PKGBUILD:1.24

--- arch/build/base/klibc-udev/PKGBUILD:1.23	Wed May  2 14:26:40 2007
+++ arch/build/base/klibc-udev/PKGBUILD	Sat May  5 11:19:34 2007
@@ -1,9 +1,9 @@
-#$Id: PKGBUILD,v 1.23 2007/05/02 18:26:40 tpowa Exp $
+#$Id: PKGBUILD,v 1.24 2007/05/05 15:19:34 tpowa Exp $
 #Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgname=klibc-udev
 pkgver=110
-pkgrel=1
+pkgrel=2
 pkgdesc="udevd compiled under klibc"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html"
@@ -13,7 +13,7 @@
         vol_id-suspend2.patch post-107.patch)
 md5sums=('34c703949f7c22745f52ef5a56d5910c' 'bcfed63882660e7d33f367d722e0a5c9'\
          '44747726599e90a2fa3db474bfc57a0e' '22741baf8f5d7d8bc88022b39bca74d8'\
-         'e69683265e6774a44558690c98937c5f' '90f4335cc6fd01b554b453e842ff212f'\
+         '25e83c062e0ca9ff1e44ba3fb95bc9de' '90f4335cc6fd01b554b453e842ff212f'\
          '80f75fc9a8fc32c7b8ff146d53bf579f' 'd3b6ac926fb7b3c34d202c1deafd9f1d')
 
 build()
Index: arch/build/base/klibc-udev/udev.rules
diff -u arch/build/base/klibc-udev/udev.rules:1.14 arch/build/base/klibc-udev/udev.rules:1.15
--- arch/build/base/klibc-udev/udev.rules:1.14	Wed May  2 14:26:40 2007
+++ arch/build/base/klibc-udev/udev.rules	Sat May  5 11:19:34 2007
@@ -101,21 +101,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"
+# do not 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"
@@ -137,7 +139,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"
 
@@ -147,13 +149,13 @@
 # by-path (shortest physical path)
 ### Broken at the moment
 #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}"
 
@@ -169,7 +171,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}"


