Changeset 4dca606

Timestamp:

Jun 12, 2007, 11:04:37 AM (17 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:

e6fe92a5

Parents:

6bb748c

Message:

Updates from Upstream

Location:

udev

Files:

• 40-modprobe.rules (modified) (2 diffs)
• 50-udev.rules (modified) (2 diffs)
• 64-device-mapper.rules (modified) (1 diff)

udev/40-modprobe.rules

@@ -19 +19 @@
 
 # scsi
-SUBSYSTEM=="scsi_device",       ACTION=="add", ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
-SUBSYSTEM=="scsi_device",       ACTION=="add", ATTRS{type}=="1", SYSFS{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"
+SUBSYSTEM=="scsi_device",       ACTION=="add", ATTRS{type}=="0|7|14", RUN+="/sbin/modprobe sd_mod"
+SUBSYSTEM=="scsi_device",       ACTION=="add", ATTRS{type}=="1", ATTR{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"
 
 # ide
 KERNEL=="hd*",          SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
-SUBSYSTEM=="ide",       ACTION=="add", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
+SUBSYSTEM=="ide",       ACTION=="add", ATTRS{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
 
 # floppy
@@ -35 +35 @@
 SUBSYSTEM=="mmc",       ACTION=="add", RUN+="/sbin/modprobe mmc_block"
 
+

udev/50-udev.rules

@@ -119 +119 @@
 # sr:           4 TYPE_WORM, 5 TYPE_ROM
 # st/osst:      1 TYPE_TAPE
-ACTION=="add",                  SUBSYSTEM=="scsi" , ATTR{type}=="0|7|14", ATTR{timeout}="60"
-ACTION=="add",                  SUBSYSTEM=="scsi" , ATTR{type}=="1", ATTR{timeout}="900"
+SUBSYSTEM=="scsi",              KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="0|7|14", ATTR{timeout}="60"
+SUBSYSTEM=="scsi",              KERNEL=="[0-9]*:[0-9]*", ACTION=="add", ATTR{type}=="1", ATTR{timeout}="900
 
 # misc storage devices (non-block)
@@ -149 +149 @@
 # libusb device access
 SUBSYSTEM=="usb",               ACTION=="add", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
-SUBSYSTEM=="usb_device",        ACTION=="add", PROGRAM="/bin/sh -c 'K=%k; K=$${K#usbdev}; printf bus/usb/%%03i/%%03i $${K%%%%.*} $${K#*.}'", NAME="%c", MODE="0644"

udev/64-device-mapper.rules

@@ -26 +26 @@
 IMPORT{program}="/sbin/dmsetup export -j%M -m%m"
 ENV{DM_STATE}!="ACTIVE",                        GOTO="device_mapper_end"
-ENV{DM_TARGET_TYPES}=="|*snapshot*|*error*",    GOTO="device_mapper_end"
+ENV{DM_TARGET_TYPES}=="|*error*",               GOTO="device_mapper_end"
 
 SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"