r1341 - / trunk/udev

jim at linuxfromscratch.org jim at linuxfromscratch.org
Mon Apr 3 21:01:27 PDT 2006


Author: jim
Date: 2006-04-03 22:01:26 -0600 (Mon, 03 Apr 2006)
New Revision: 1341

Modified:
   /
   trunk/udev/
   trunk/udev/35-helper.rules
   trunk/udev/60-persistent-disk.rules
   trunk/udev/61-persistent-input.rules
Log:
 r2776 at server (orig r1341):  jim | 2006-04-03 20:21:42 -0700
  r2774 at server:  jim | 2006-04-03 20:20:02 -0700
  Updated based on UDEV-089
 



Property changes on: 
___________________________________________________________________
Name: svk:merge
   - b6734a72-470d-0410-b049-f317dca95413:/:1340
   + b6734a72-470d-0410-b049-f317dca95413:/:1341


Property changes on: trunk/udev
___________________________________________________________________
Name: svk:merge
   - 38c7b366-470d-0410-a457-935707c16d9b:/udev:2764
3949c430-d905-0410-97b6-f115d20341b5:/udev:1348
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/udev:1263
   + 38c7b366-470d-0410-a457-935707c16d9b:/udev:2774
3949c430-d905-0410-97b6-f115d20341b5:/udev:1348
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/udev:1263

Modified: trunk/udev/35-helper.rules
===================================================================
--- trunk/udev/35-helper.rules	2006-04-04 04:00:48 UTC (rev 1340)
+++ trunk/udev/35-helper.rules	2006-04-04 04:01:26 UTC (rev 1341)
@@ -18,9 +18,9 @@
 SUBSYSTEM=="firmware",	ACTION=="add", RUN+="firmware_helper"
 
 # check cdrom helper
-BUS=="ide",	KERNEL=="hd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
-BUS=="scsi",	KERNEL="scd[a-z]", ACTION=="add", IMPORT="/sbin/cdrom_id --export $tempnode"
+BUS=="ide",	KERNEL=="hd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
+BUS=="scsi",	KERNEL=="sr[0-9]*", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
+BUS=="scsi",	KERNEL="scd[a-z]", ACTION=="add", IMPORT="cdrom_id --export $tempnode"
 BUS=="scsi",	KERNEL=="sg[0-9]*", ACTION=="add", DRIVER=="sr", GROUP="cdrom"
 
 ENV{ID_CDROM}=="?*",		SYMLINK+="cdrom%m", GROUP="cdrom"

Modified: trunk/udev/60-persistent-disk.rules
===================================================================
--- trunk/udev/60-persistent-disk.rules	2006-04-04 04:00:48 UTC (rev 1340)
+++ trunk/udev/60-persistent-disk.rules	2006-04-04 04:01:26 UTC (rev 1341)
@@ -27,15 +27,15 @@
 BUS=="ide",	DRIVER!="ide-cdrom", SYSFS{removable}="1", GOTO="persistent_end"
 
 # by-id (hardware serial number)
-KERNEL=="hd*[!0-9]",	IMPORT{program}="/sbin/ata_id --export $tempnode"
+KERNEL=="hd*[!0-9]",	IMPORT{program}="ata_id --export $tempnode"
 KERNEL=="hd*[!0-9]",	ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}"
 KERNEL=="hd*[0-9]",	IMPORT{parent}=="ID_*", SYMLINK+="disk/by-id/ata-$env{ID_MODEL}_$env{ID_SERIAL}-part%n"
 
 KERNEL=="sd*[!0-9]|sr*",		SYSFS{ieee1394_id}=="*", ENV{ID_SERIAL}="$sysfs{ieee1394_id}", ENV{ID_BUS}="ieee1394"
-KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/usb_id -x"
-KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -s %p -d $tempnode"
-KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", IMPORT{program}="/sbin/scsi_id -g -x -a -s %p -d $tempnode"
-KERNEL=="dasd*[!0-9]",			IMPORT{program}="/sbin/dasd_id --export $tempnode"
+KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", IMPORT{program}="usb_id -x"
+KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -s %p -d $tempnode"
+KERNEL=="sd*[!0-9]|sr*",		ENV{ID_SERIAL}=="", IMPORT{program}="scsi_id -g -x -a -s %p -d $tempnode"
+KERNEL=="dasd*[!0-9]",			IMPORT{program}="dasd_id --export $tempnode"
 KERNEL=="sd*[!0-9]|sr*|dasd*[!0-9]",	ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}"
 
 # for partitions import parent information
@@ -43,19 +43,19 @@
 KERNEL=="sd*[0-9]|dasd*[0-9]",	ENV{ID_SERIAL}=="?*", SYMLINK+="disk/by-id/$env{ID_BUS}-$env{ID_SERIAL}-part%n"
 
 # by-path (shortest physical path)
-KERNEL=="*[!0-9]|sr*",	ENV{ID_TYPE}=="?*", IMPORT{program}="/sbin/path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
+KERNEL=="*[!0-9]|sr*",	ENV{ID_TYPE}=="?*", IMPORT{program}="path_id %p", SYMLINK+="disk/by-path/$env{ID_PATH}"
 KERNEL=="sr*",		GOTO="persistent_end"
 KERNEL=="*[0-9]",	IMPORT{parent}=="ID_*"
 KERNEL=="*[0-9]",	ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
 
 # by-label/by-uuid (filesystem properties)
 KERNEL=="*[!0-9]",		SYSFS{removable}=="1", GOTO="persistent_end"
-IMPORT{program}="/sbin/vol_id --export $tempnode"
+IMPORT{program}="vol_id --export $tempnode"
 ENV{ID_FS_UUID}=="?*",		SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
 ENV{ID_FS_LABEL_SAFE}=="?*",	SYMLINK+="disk/by-label/$env{ID_FS_LABEL_SAFE}"
 
 # BIOS Enhanced Disk Device
-KERNEL=="*[!0-9]",	IMPORT{program}="/sbin/edd_id --export $tempnode"
+KERNEL=="*[!0-9]",	IMPORT{program}="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"
 

Modified: trunk/udev/61-persistent-input.rules
===================================================================
--- trunk/udev/61-persistent-input.rules	2006-04-04 04:00:48 UTC (rev 1340)
+++ trunk/udev/61-persistent-input.rules	2006-04-04 04:01:26 UTC (rev 1341)
@@ -19,7 +19,7 @@
 KERNEL=="input[0-9]*", 	GOTO="persistent_input_end"
 
 # usb devices
-BUS=="usb", IMPORT{program}="/sbin/usb_id -x"
+BUS=="usb", IMPORT{program}="usb_id -x"
 BUS=="usb", SYSFS{bInterfaceClass}="03", SYSFS{bInterfaceProtocol}="01", ENV{ID_CLASS}="kbd"
 BUS=="usb", SYSFS{bInterfaceClass}="03", SYSFS{bInterfaceProtocol}="02", ENV{ID_CLASS}="mouse"
 
@@ -28,7 +28,7 @@
 KERNEL=="event*", ENV{ID_BUS}=="?*", ENV{ID_SERIAL}=="?*", ENV{ID_CLASS}=="?*", SYMLINK+="input/by-id/$env{ID_BUS}-$env{ID_SERIAL}-event-$env{ID_CLASS}"
 
 # by-path
-IMPORT{program}="/sbin/path_id %p"
+IMPORT{program}="path_id %p"
 ENV{ID_PATH}=="?*", KERNEL=="mouse*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}"
 ENV{ID_PATH}=="?*", KERNEL=="event*", SYMLINK+="input/by-path/$env{ID_PATH}-$env{ID_CLASS}"
 




More information about the cross-lfs mailing list