summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO1
-rw-r--r--extras/firmware/50-firmware.rules4
-rw-r--r--extras/firmware/Makefile.am3
-rw-r--r--rules/rules.d/50-udev-default.rules3
-rw-r--r--rules/rules.d/80-drivers.rules16
5 files changed, 17 insertions, 10 deletions
diff --git a/TODO b/TODO
index 3fd49ac5da..8cb24b807c 100644
--- a/TODO
+++ b/TODO
@@ -1,4 +1,5 @@
+ o add scsi:t-0x09* to ch and remove modprobe rule
o switch device mapper rules to:
dmsetup info -c --nameprefixes --unquoted --rows --noheadings \
-o name,uuid,suspended,readonly,major,minor,open,tables_loaded
diff --git a/extras/firmware/50-firmware.rules b/extras/firmware/50-firmware.rules
new file mode 100644
index 0000000000..a28e2a875d
--- /dev/null
+++ b/extras/firmware/50-firmware.rules
@@ -0,0 +1,4 @@
+# do not edit this file, it will be overwritten on update
+
+# firmware-class requests, copies files into the kernel
+SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
diff --git a/extras/firmware/Makefile.am b/extras/firmware/Makefile.am
index 4d1b19523e..42f58768c9 100644
--- a/extras/firmware/Makefile.am
+++ b/extras/firmware/Makefile.am
@@ -4,3 +4,6 @@ udevhomedir = $(udev_prefix)/lib/udev
dist_udevhome_SCRIPTS = \
firmware.sh
+udevrulesdir = $(udev_prefix)/lib/udev/rules.d
+dist_udevrules_DATA = \
+ 50-firmware.rules
diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index 0f27982d85..c58e24f66e 100644
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -56,9 +56,6 @@ KERNEL=="dv1394*", SYMLINK+="dv1394/%n"
KERNEL=="video1394*", NAME="video1394/%n"
KERNEL=="dv1394*|video1394*|raw1394*", GROUP="video"
-# firmware class requests
-SUBSYSTEM=="firmware", ACTION=="add", RUN+="firmware.sh"
-
# libusb device nodes
SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", NAME="bus/usb/$env{BUSNUM}/$env{DEVNUM}", MODE="0644"
diff --git a/rules/rules.d/80-drivers.rules b/rules/rules.d/80-drivers.rules
index 66c0375268..7e13e80764 100644
--- a/rules/rules.d/80-drivers.rules
+++ b/rules/rules.d/80-drivers.rules
@@ -2,13 +2,15 @@
ACTION!="add", GOTO="drivers_end"
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe $env{MODALIAS}"
-SUBSYSTEM=="tifm", RUN+="/sbin/modprobe --all tifm_sd tifm_ms"
-SUBSYSTEM=="memstick", RUN+="/sbin/modprobe --all ms_block mspro_block"
-SUBSYSTEM=="mmc", RUN+="/sbin/modprobe mmc_block"
-SUBSYSTEM=="i2o", RUN+="/sbin/modprobe i2o_block"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe ppdev"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="/sbin/modprobe -b $env{MODALIAS}"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -b tifm_sd"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -b tifm_ms"
+SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -b --all ms_block mspro_block"
+SUBSYSTEM=="mmc", RUN+="/sbin/modprobe -b mmc_block"
+SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -b i2o_block"
+SUBSYSTEM=="scsi", ATTR{type}=="8", RUN+="/sbin/modprobe -b ch"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -b sg"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -b ppdev"
LABEL="drivers_end"