Changeset bda8cfb

Timestamp:

Aug 31, 2006, 9:18:26 AM (18 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:

d49afdb

Parents:

664631f

Message:

r5455@server: jim | 2006-08-31 09:17:48 -0700
Updated for Udev 098

Location:

udev

Files:

• 35-helper.rules (modified) (1 diff)
• 40-modprobe.rules (modified) (1 diff)
• 50-udev.rules (modified) (1 diff)
• 60-persistent-disk.rules (modified) (4 diffs)
• 61-persistent-input.rules (modified) (1 diff)
• 70-device-mapper.rules (added)
• Makefile (modified) (2 diffs)

udev/35-helper.rules

@@ -37 +37 @@
 
 # adds floppy devices
-KERNEL=="fd[0-9]*", ACTION=="add", SYSFS{cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{cmos} -m %M /dev/%k"t
-
+KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="*", RUN+="create_floppy_devices -c -t $sysfs{cmos} -m %M /dev/%k"

udev/40-modprobe.rules

@@ -19 +19 @@
 
 # scsi
-SUBSYSTEM=="scsi_device",       ACTION=="add", SYSFS{device/type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
-SUBSYSTEM=="scsi_device",       ACTION=="add", SYSFS{device/type}=="1", SYSFS{device/vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
-SUBSYSTEM=="scsi_device",       ACTION=="add", SYSFS{device/type}=="1", RUN+="/sbin/modprobe st"
-SUBSYSTEM=="scsi_device",       ACTION=="add", SYSFS{device/type}=="[45]", RUN+="/sbin/modprobe sr_mod"
+SUBSYSTEM=="scsi_device",       ACTION=="add", ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
+SUBSYSTEM=="scsi_device",       ACTION=="add", ATTRS{type}=="1", SYSFS{device/vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
+SUBSYSTEM=="scsi_device",       ACTION=="add", ATTRS{type}=="1", RUN+="/sbin/modprobe st"
+SUBSYSTEM=="scsi_device",       ACTION=="add", ATTRS{type}=="[45]", RUN+="/sbin/modprobe sr_mod"
 SUBSYSTEM=="scsi_device",       ACTION=="add", RUN+="/sbin/modprobe sg"
 

udev/50-udev.rules

@@ -35 +35 @@
 KERNEL=="hvsi*",                GROUP="uucp"
 KERNEL=="iseries/vtty*",        GROUP="uucp"
-KERNEL=="ttyUSB*",              SYSFS{product}=="[Pp]alm*Handheld*", SYMLINK+="pilot"
+KERNEL=="ttyUSB*",              ATTRS{product}=="[Pp]alm*Handheld*", SYMLINK+="pilot"
 
 # video/graphics

udev/60-persistent-disk.rules

@@ -18 +18 @@
 # scheme based on "Linux persistent device names", 2004, Hannes Reinecke <hare@suse.de>
 
-ACTION!="add",          GOTO="persistent_end"
-SUBSYSTEM!="block",     GOTO="persistent_end"
+ACTION!="add",          GOTO="persistent_storage_end"
+SUBSYSTEM!="block",     GOTO="persistent_storage_end"
 
 # skip rules for inappropriate block devices
-KERNEL=="ram*|loop*|fd*|nbd*",  GOTO="persistent_end"
+KERNEL=="ram*|loop*|fd*|nbd*",  GOTO="persistent_storage_end"
+
+# Set Permissions on CDOM
+BUS=="ide",     DRIVER=="ide-cdrom", ATTRS{removable}=="1", GROUP="cdrom", MODE="660"
 
 # never access removable ide devices, the drivers are causing event loops on open()
-BUS=="ide",     DRIVER=="ide-cdrom", SYSFS{removable}=="1", GROUP="cdrom", MODE="660"
-BUS=="ide",     DRIVER!="ide-cdrom", SYSFS{removable}=="1", GOTO="persistent_end"
+KERNEL=="hd*[!0-9]", ATTRS{removable}=="1", DRIVERS=="ide-cs|ide-floppy", GOTO="persistent_storage_end"
+KERNEL=="hd*[0-9]", ATTRS{../removable}=="1", GOTO="persistent_storage_end"
 
 # by-id (hardware serial number)
@@ -33 +36 @@
 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*",                ATTRS{ieee1394_id}=="*", ENV{ID_SERIAL}="$attr{ieee1394_id}", ENV{ID_BUS}="ieee1394"
 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"
@@ -46 +49 @@
 # by-path (shortest physical 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=="sr*",          GOTO="persistent_storage_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"
+KERNEL=="*[!0-9]",              ATTRS{removable}=="1", GOTO="persistent_storage_end"
 IMPORT{program}="vol_id --export $tempnode"
 ENV{ID_FS_UUID}=="?*",          SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}"
@@ -63 +66 @@
 KERNEL=="dm-[0-9]*",    ACTION=="add", PROGRAM="/sbin/dmsetup info -c --noopencount --noheadings -o name -j %M -m %m", SYMLINK+="disk/by-name/%c"
 
-LABEL="persistent_end"
+LABEL="persistent_storage_end"

udev/61-persistent-input.rules

@@ -21 +21 @@
 # usb devices
 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"
+BUS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="01", ENV{ID_CLASS}="kbd"
+BUS=="usb", ATTRS{bInterfaceClass}=="03", ATTRS{bInterfaceProtocol}=="02", ENV{ID_CLASS}="mouse"
+
+# other devices
+DRIVERS=="pcspkr", ENV{ID_CLASS}="spkr"
+DRIVERS=="atkbd", ENV{ID_CLASS}="kbd"
+DRIVERS=="psmouse", ENV{ID_CLASS}="mouse"
+ATTRS{name}=="*dvb*|*DVB*|* IR *", ENV{ID_CLASS}="ir"
+ATTRS{modalias}=="input:*-*a[068],*|input:*-*a*,[68],*m*", ATTRS{modalias}!="input:*-*k*14A,*r*", ENV{ID_CLASS}="joystick"
+
+ENV{ID_SERIAL}=="", ENV{ID_SERIAL}="noserial"
 
 # by-id links

udev/Makefile

@@ -83 +83 @@
         @echo "---------------------------------------------------------------------------------------"
         @echo "make install                     install udev rules package and helper scripts"
+        @echo "make install-device-mapper       install device-mapper rules"
         @echo "make install-netboot             install udev rules package for netboot"
         @echo "make install-network             install network helper package"
@@ -95 +96 @@
         install -m 644 contrib/common/udev_helper ${DESTDIR}/etc/sysconfig/udev_helper
         
+install-device-mapper:
+        install -d ${DESTDIR}/lib/udev
+        install -d ${DESTDIR}/etc/rc.d/init.d
+        install -m ${RULESMODE} 70-device-mapper.rules ${DESTDIR}/etc/udev/rules.d/70-device-mapper.rules
+
 install-network: install-helper-functions install-network-update
         install -d ${DESTDIR}/etc/udev/rules.d/