--- trunk/udev/udev-drivers.rules.magellan	2008/12/22 20:31:37	717
+++ trunk/udev/udev-drivers.rules.magellan	2010/08/18 02:24:13	1088
@@ -1,5 +1,5 @@
 # /etc/udev/rules/80-drivers.rules:  device naming rules for udev
-# $Header: /root/magellan-cvs/src/udev/udev-drivers.rules.magellan,v 1.2 2008-12-22 20:31:37 niro Exp $
+# $Header: /root/magellan-cvs/src/udev/udev-drivers.rules.magellan,v 1.5 2010-08-18 02:24:12 niro Exp $
 #
 # There are a number of modifiers that are allowed to be used in some
 # of the different fields. They provide the following subsitutions:
@@ -18,15 +18,14 @@
 # file that can be run before this one.
 #
 
-ACTION!="add", GOTO="drivers_end"
+ACTION=="remove", GOTO="drivers_end"
 
-DRIVER!="?*", ENV{MODALIAS}=="?*", RUN{ignore_error}+="modprobe.sh $env{MODALIAS}"
-SUBSYSTEM=="tifm", RUN+="modprobe.sh --all tifm_sd tifm_ms"
-SUBSYSTEM=="memstick", RUN+="modprobe.sh --all ms_block mspro_block"
-SUBSYSTEM=="mmc", RUN+="modprobe.sh mmc_block"
-SUBSYSTEM=="i2o", RUN+="modprobe.sh i2o_block"
-SUBSYSTEM=="ide", ATTR{media}=="tape", RUN+="modprobe.sh ide-scsi"
-SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="modprobe.sh sg"
-SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="modprobe.sh ppdev"
+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="modprobe.sh -b $env{MODALIAS}"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="modprobe.sh -b tifm_sd"
+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="modprobe.sh -b tifm_ms"
+SUBSYSTEM=="memstick", RUN+="modprobe.sh -b --all ms_block mspro_block"
+SUBSYSTEM=="i2o", RUN+="modprobe.sh -b i2o_block"
+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="modprobe.sh -b sg"
+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="modprobe.sh -b ppdev"
 
 LABEL="drivers_end"