Changeset dfdebf6

Timestamp:

Apr 3, 2006, 8:21:42 PM (19 years ago)

Author:

Jim Gifford <clfs@…>

Branches:

clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit

Children:

968489e

Parents:

8359ebc

Message:

r2774@server: jim | 2006-04-03 20:20:02 -0700
Updated based on UDEV-089

Location:

udev

Files:

• 35-helper.rules (modified) (1 diff)
• 60-persistent-disk.rules (modified) (3 diffs)
• 61-persistent-input.rules (modified) (2 diffs)

udev/35-helper.rules

@@ -19 +19 @@
 
 # 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"
 

udev/60-persistent-disk.rules

@@ -28 +28 @@
 
 # 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}"
 
@@ -44 +44 @@
 
 # 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_*"
@@ -51 +51 @@
 # 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"

udev/61-persistent-input.rules

@@ -20 +20 @@
 
 # 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"
@@ -29 +29 @@
 
 # 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}"