From 8ef0480124a61601593f478920b45674bfc457d2 Mon Sep 17 00:00:00 2001
From: Alejandro Mery <amery@opensde.org>
Date: Thu, 14 Jun 2007 15:28:27 +0000
Subject: [PATCH]  * moved modprobe-s on udev rules from 50-udev-defaults.rules
 to 40-hotplug.rules

git-svn-id: svn://svn.opensde.net/opensde/package/branches/udev@21351 10447126-35f2-4685-b0cf-6dd780d3921f
---
 filesystem/udev/rules/40-modprobe.rules     | 18 ++++++++++++++++++
 filesystem/udev/rules/50-udev-default.rules | 11 ++---------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/filesystem/udev/rules/40-modprobe.rules b/filesystem/udev/rules/40-modprobe.rules
index 080ad651d..55bd31304 100644
--- a/filesystem/udev/rules/40-modprobe.rules
+++ b/filesystem/udev/rules/40-modprobe.rules
@@ -1,2 +1,20 @@
+# vi: set ft=conf :
+
 # hotplug
 ENV{MODALIAS}=="?*",	RUN+="/sbin/modprobe $env{MODALIAS}"
+
+# scsi
+
+# sd:		0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
+# sr:		4 TYPE_WORM, 5 TYPE_ROM
+# st/osst:	1 TYPE_TAPE
+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"
+SUBSYSTEM=="scsi_device", ACTION=="add", ATTRS{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
+SUBSYSTEM=="scsi_device", ACTION=="add", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
+
+# ide
+SUBSYSTEM=="ide", ACTION=="add", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
+
+# mmc
+SUBSYSTEM=="mmc", ACTION=="add", RUN+="/sbin/modprobe mmc_block"
diff --git a/filesystem/udev/rules/50-udev-default.rules b/filesystem/udev/rules/50-udev-default.rules
index 7fbc0a1cb..4f8579d47 100644
--- a/filesystem/udev/rules/50-udev-default.rules
+++ b/filesystem/udev/rules/50-udev-default.rules
@@ -1,3 +1,5 @@
+# vi: set ft=conf :
+
 # console (NAME)
 KERNEL=="pty[pqrstuvwxyzabcdef][0123456789abcdef]",	NAME="pty/m%m"
 KERNEL=="tty[pqrstuvwxyzabcdef][0123456789abcdef]",	NAME="pty/s%m"
@@ -95,16 +97,7 @@ KERNEL=="fd[0-9]*", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_device
 # block devices
 SUBSYSTEM=="block", GROUP="disk", MODE="0640"
 
-# sd:		0 TYPE_DISK, 7 TYPE_MOD, 14 TYPE_RBC
-# sr:		4 TYPE_WORM, 5 TYPE_ROM
-# st/osst:	1 TYPE_TAPE
-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"
-SUBSYSTEM=="scsi_device", ACTION=="add", ATTRS{type}=="1", ATTR{vendor}=="On[sS]tream", RUN+="/sbin/modprobe osst"
-SUBSYSTEM=="scsi_device", ACTION=="add", TEST!="[module/sg]", RUN+="/sbin/modprobe sg"
 KERNEL=="hd*", SUBSYSTEMS=="ide", ATTRS{media}=="floppy", OPTIONS+="all_partitions"
-SUBSYSTEM=="ide", ACTION=="add", ATTR{media}=="tape", RUN+="/sbin/modprobe ide-scsi"
-SUBSYSTEM=="mmc", ACTION=="add", RUN+="/sbin/modprobe mmc_block"
 
 # misc storage devices (non-block)
 KERNEL=="sg*",			GROUP="disk", MODE="0640"