r1097 - trunk/udev

jim at linuxfromscratch.org jim at linuxfromscratch.org
Wed Jan 25 11:02:15 PST 2006


Author: jim
Date: 2006-01-25 12:02:14 -0700 (Wed, 25 Jan 2006)
New Revision: 1097

Modified:
   trunk/udev/
   trunk/udev/35-helper.rules
   trunk/udev/50-udev.rules
   trunk/udev/Makefile
Log:
 r1111 at server:  jim | 2006-01-25 10:56:58 -0800
 Added: cdrom rules



Property changes on: trunk/udev
___________________________________________________________________
Name: svk:merge
   - 3949c430-d905-0410-97b6-f115d20341b5:/udev:1348
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/udev:1099
   + 3949c430-d905-0410-97b6-f115d20341b5:/udev:1348
3b7552df-c20a-0410-b7e1-d7eaf1be8828:/udev:1111

Modified: trunk/udev/35-helper.rules
===================================================================
--- trunk/udev/35-helper.rules	2006-01-25 17:51:36 UTC (rev 1096)
+++ trunk/udev/35-helper.rules	2006-01-25 19:02:14 UTC (rev 1097)
@@ -16,3 +16,13 @@
 
 # kernel firmware loader
 SUBSYSTEM=="firmware",	ACTION=="add", RUN+="firmware_helper"
+
+# 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"
+

Modified: trunk/udev/50-udev.rules
===================================================================
--- trunk/udev/50-udev.rules	2006-01-25 17:51:36 UTC (rev 1096)
+++ trunk/udev/50-udev.rules	2006-01-25 19:02:14 UTC (rev 1097)
@@ -161,3 +161,9 @@
 
 # libusb device access
 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"
+

Modified: trunk/udev/Makefile
===================================================================
--- trunk/udev/Makefile	2006-01-25 17:51:36 UTC (rev 1096)
+++ trunk/udev/Makefile	2006-01-25 19:02:14 UTC (rev 1097)
@@ -21,6 +21,7 @@
 
 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
 	install -m ${SCRIPTMODE} input.sh ${DESTDIR}/lib/udev/input.sh
 
 boot:




More information about the cross-lfs mailing list