Changeset bf5fe0d

Timestamp:

Mar 14, 2006, 3:47:21 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:

3fbe135

Parents:

53885ce

Message:

r2566@server: jim | 2006-03-14 15:46:21 -0800
Updated cdrom detection

Location:

udev

Files:

• 35-helper.rules (modified) (1 diff)
• 50-udev.rules (modified) (1 diff)
• Makefile (modified) (1 diff)
• check-cdrom.sh (deleted)
• udev.makechanges (modified) (1 diff)

udev/35-helper.rules

@@ -19 +19 @@
 
 # check cdrom helper
-KERNEL=="hd[a-z]",      BUS=="ide", SYSFS{removable}=="1", RESULT=="cdrom", SYMLINK+="cdrom%e"
-KERNEL=="hd[a-z]",      BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-KERNEL=="sr[0-9]*",     BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD", SYMLINK+="dvd%e"
-KERNEL=="hd[a-z]",      BUS=="ide", SYSFS{removable}=="1", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-KERNEL=="sr[0-9]*",     BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k CD-R", SYMLINK+="cdwriter%e"
-KERNEL=="hd[a-z]",      BUS=="ide", SYSFS{removable}=="1", PROGRAM="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
-KERNEL=="sr[0-9]*",     BUS=="scsi", PROGRAM=="/lib/udev/check-cdrom.sh %k DVD-R", SYMLINK+="dvdwriter%e"
+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=="scsi",    KERNEL=="sg[0-9]*", ACTION=="add", DRIVER=="sr", GROUP="cdrom"
 
+ENV{ID_CDROM}=="?*",            SYMLINK+="cdrom%m", GROUP="cdrom"
+ENV{ID_CDROM_CD_R}=="?*",       SYMLINK+="cdr%m"
+ENV{ID_CDROM_CD_RW}=="?*",      SYMLINK+="cdrw%m"
+ENV{ID_CDROM_DVD}=="?*",        SYMLINK+="dvd%m"
+ENV{ID_CDROM_DVD_R}=="?*",      SYMLINK+="dvdrw%m"
+
+# Run network stuff when the network device is loaded
+ACTION=="add", SUBSYSTEM=="net", ENV{INTERFACE}=="*", RUN+="network_helper.sh"
+ACTION=="remove", SUBSYSTEM=="net", ENV{INTERFACE}=="*", RUN+="network_helper.sh"
+

udev/50-udev.rules

@@ -162 +162 @@
 SUBSYSTEM=="usb_device",        PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"
 
-# cdrom
-KERNEL=="sr[0-9]*",             GROUP="cdrom", SYMLINK+="cdrom%e"
-KERNEL=="scd[0-9]*",            GROUP="cdrom", SYMLINK+="cdrom%e"
-KERNEL=="pcd[0-9]*",            GROUP="cdrom", SYMLINK+="cdrom%e"
-

udev/Makefile

@@ -30 +30 @@
 scripts:
         install -m ${SCRIPTMODE} load_floppy_module.sh ${DESTDIR}/lib/udev/load_floppy_module.sh
-        install -m ${SCRIPTMODE} check-cdrom.sh ${DESTDIR}/lib/udev/check-cdrom.sh
 
 boot:

udev/udev.makechanges

@@ -11 +11 @@
 Second, you will need to use udev 079 or above, here is the build instructions
 you must use to get full functionality.
-make EXTRAS="extras/firmware extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id extras/dasd_id" udevdir=/dev
+make EXTRAS="extras/firmware extras/cdrom_id extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id extras/dasd_id" udevdir=/dev
 
-make EXTRAS="extras/firmware extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id extras/dasd_id" udevdir=/dev install
+make EXTRAS="extras/firmware extras/cdrom_id extras/scsi_id extras/volume_id extras/ata_id extras/usb_id extras/edd_id extras/dasd_id" udevdir=/dev install
 cp extras/path_id /sbin
 cp extras/eventrecorder.sh /lib/udev