diff options
| -rw-r--r-- | etc/udev/debian/devfs.rules | 2 | ||||
| -rw-r--r-- | etc/udev/debian/hotplug.rules | 8 | ||||
| -rw-r--r-- | etc/udev/debian/permissions.rules | 7 | ||||
| -rw-r--r-- | etc/udev/debian/persistent.rules | 8 | ||||
| -rw-r--r-- | etc/udev/debian/udev.rules | 2 |
5 files changed, 14 insertions, 13 deletions
diff --git a/etc/udev/debian/devfs.rules b/etc/udev/debian/devfs.rules index 107b197d91..37e4ae1bc9 100644 --- a/etc/udev/debian/devfs.rules +++ b/etc/udev/debian/devfs.rules @@ -13,7 +13,7 @@ # # workaround for devices which do not report media changes -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{removable}=="1", \ +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \ ENV{ID_MODEL}=="IOMEGA_ZIP*", NAME="%k", OPTIONS+="all_partitions" SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \ OPTIONS+="all_partitions" diff --git a/etc/udev/debian/hotplug.rules b/etc/udev/debian/hotplug.rules index eae68864c9..8b48d77f56 100644 --- a/etc/udev/debian/hotplug.rules +++ b/etc/udev/debian/hotplug.rules @@ -1,7 +1,7 @@ ACTION!="add", GOTO="hotplug_not_add_event" # check if the device has already been claimed by a driver -ENV{PHYSDEVDRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_driver_loaded" +ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_driver_loaded" # load the drivers ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe $env{MODALIAS}" @@ -25,7 +25,7 @@ SUBSYSTEM=="scsi_device", ATTRS{type}=="1", RUN+="/sbin/modprobe st", \ SUBSYSTEM=="scsi_device", ATTRS{type}=="[45]", RUN+="/sbin/modprobe sr_mod" SUBSYSTEM=="scsi_device", ATTRS{type}=="[235689]", RUN+="/sbin/modprobe sg" -SUBSYSTEM=="ide", ATTRS{media}=="tape", RUN+="/sbin/modprobe ide-scsi" +SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi" # From here on follows the hotplug agents which do not load modules LABEL="hotplug_driver_loaded" @@ -34,11 +34,11 @@ LABEL="hotplug_driver_loaded" #SUBSYSTEM=="scsi_device", ATTRS{idVendor}=="...", \ # RUN+="scsi-re-add" -SUBSYSTEM=="firmware", RUN+="firmware.agent" +SUBSYSTEM=="firmware", RUN+="firmware.agent" LABEL="hotplug_not_add_event" -SUBSYSTEM=="net", RUN+="/bin/sh -c '/lib/udev/net.agent &'" +SUBSYSTEM=="net", RUN+="net.agent" # Log every event to /dev/hotplug.log (for debugging). #RUN+="logger.agent" diff --git a/etc/udev/debian/permissions.rules b/etc/udev/debian/permissions.rules index 8b369596a3..06bbf66260 100644 --- a/etc/udev/debian/permissions.rules +++ b/etc/udev/debian/permissions.rules @@ -2,16 +2,16 @@ ACTION!="add", GOTO="permissions_end" # workarounds needed to synchronize with sysfs # only needed for kernels < v2.6.18-rc1 -DEVPATH=="/devices/*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" +ENV{PHYSDEVPATH}!="?*", ENV{PHYSDEVBUS}=="?*", WAIT_FOR_SYSFS="bus" SUBSYSTEM=="scsi", WAIT_FOR_SYSFS="ioerr_cnt" # only needed for kernels < 2.6.16 SUBSYSTEM=="net", WAIT_FOR_SYSFS="address" # only needed for kernels < 2.6.17 -SUBSYSTEM=="net", ENV{PHYSDEVDRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" +SUBSYSTEM=="net", ENV{DRIVER}=="?*", WAIT_FOR_SYSFS="device/driver" # default permissions for block devices SUBSYSTEM=="block", GROUP="disk" -SUBSYSTEM=="block", ATTRS{removable}=="1", GROUP="floppy" +SUBSYSTEM=="block", ATTR{removable}=="1", GROUP="floppy" # IDE devices KERNEL=="hd[a-z]|pcd[0-9]*", DRIVERS=="ide-cdrom|pcd", \ @@ -21,6 +21,7 @@ KERNEL=="ht[0-9]*", GROUP="tape" KERNEL=="nht[0-9]*", GROUP="tape" # SCSI devices +KERNEL=="sr[0-9]*", IMPORT{program}="cdrom_id --export $tempnode" SUBSYSTEMS=="scsi", ATTRS{type}=="1", GROUP="tape" SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="HP", GROUP="scanner" SUBSYSTEMS=="scsi", ATTRS{type}=="3", ATTRS{vendor}=="Epson", GROUP="scanner" diff --git a/etc/udev/debian/persistent.rules b/etc/udev/debian/persistent.rules index ce8a6a0af2..277d03dea8 100644 --- a/etc/udev/debian/persistent.rules +++ b/etc/udev/debian/persistent.rules @@ -8,9 +8,9 @@ ACTION!="add", GOTO="no_volume_id" KERNEL=="ram*|loop*|fd*|nbd*|dm-*", GOTO="no_volume_id" # skip removable ide devices, because open(2) on them causes an events loop -KERNEL=="hd*[!0-9]", ATTRS{removable}=="1", DRIVERS=="ide-cs|ide-floppy", \ +KERNEL=="hd*[!0-9]", ATTR{removable}=="1", DRIVERS=="ide-cs|ide-floppy", \ GOTO="no_volume_id" -KERNEL=="hd*[0-9]", ATTRS{../removable}=="1", \ +KERNEL=="hd*[0-9]", ATTR{../removable}=="1", \ GOTO="no_volume_id" # skip xen virtual hard disks @@ -21,7 +21,7 @@ KERNEL=="hd*[!0-9]", \ IMPORT{program}="ata_id --export $tempnode" KERNEL=="sd*[!0-9]|sr*|st*", ATTRS{ieee1394_id}=="?*", \ - ENV{ID_BUS}="ieee1394", ENV{ID_SERIAL}="$sysfs{ieee1394_id}" + ENV{ID_BUS}="ieee1394", ENV{ID_SERIAL}="$attr{ieee1394_id}" KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", \ IMPORT{program}="usb_id -x" KERNEL=="sd*[!0-9]|sr*|st*", ENV{ID_SERIAL}=="", \ @@ -67,7 +67,7 @@ KERNEL=="*[0-9]", ENV{ID_PATH}=="?*", \ SYMLINK+="disk/by-path/$env{ID_PATH}-part%n" # UUID and volume label -KERNEL=="*[!0-9]", ATTRS{removable}=="1", GOTO="no_volume_id" +KERNEL=="*[!0-9]", ATTR{removable}=="1", GOTO="no_volume_id" IMPORT{program}="vol_id --export $tempnode" ENV{ID_FS_UUID}=="?*", ENV{ID_FS_USAGE}=="filesystem|other|crypto", \ SYMLINK+="disk/by-uuid/$env{ID_FS_UUID}" diff --git a/etc/udev/debian/udev.rules b/etc/udev/debian/udev.rules index 6498a131da..3da6fadf8f 100644 --- a/etc/udev/debian/udev.rules +++ b/etc/udev/debian/udev.rules @@ -13,7 +13,7 @@ # # workaround for devices which do not report media changes -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{removable}=="1", \ +SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", \ ENV{ID_MODEL}=="IOMEGA_ZIP*", NAME="%k", OPTIONS+="all_partitions" SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTRS{media}=="floppy", \ OPTIONS+="all_partitions" |