Drop our Debian specific 80-drivers.rules

Use the upstream rules with a patch for the sg module (see #657948). These now
stop calling modprobe and use the kmod builtin, giving some nice boot speed
improvement.

Closes: #717404

debian/changelog

@@ -25,6 +25,10 @@ systemd (204-9) UNRELEASED; urgency=medium
   * Drop our Debian specific 60-persistent-storage{,-tape}.rules and use the
     upstream rules. They are compatible and do a superset of the
     functionality.
+  * Drop our Debian specific 80-drivers.rules and use the upstream rules with
+    a patch for the sg module (see #657948). These now stop calling modprobe
+    and use the kmod builtin, giving some nice boot speed improvement.
+    (Closes: #717404)
 
  -- Michael Biebl <biebl@debian.org>  Sat, 26 Apr 2014 10:41:18 +0200
 

debian/extra/rules/80-drivers.rules

-ACTION=="remove", GOTO="drivers_end"
-
-# check if the device has already been claimed by a driver
-ENV{DRIVER}=="?*", SUBSYSTEM!="input", GOTO="hotplug_driver_loaded"
-
-# load the drivers
-ENV{MODALIAS}=="?*",			RUN+="/sbin/modprobe -b $env{MODALIAS}"
-
-SUBSYSTEM=="pcmcia_socket",		RUN+="/sbin/modprobe -b pcmcia"
-
-# rules for subsystems which lack proper hotplug support
-SUBSYSTEM=="i2o",			RUN+="/sbin/modprobe -b i2o_block"
-SUBSYSTEM=="memstick",	RUN+="/sbin/modprobe -b --all ms_block mspro_block"
-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=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", \
-					RUN+="/sbin/modprobe -b sg"
-
-# Load VIO modules based on the device type
-SUBSYSTEM!="vio", GOTO="hotplug_vio_end"
-ENV{MODALIAS}=="?*", GOTO="hotplug_vio_end"
-ENV{VIO_TYPE}!="?*", IMPORT{program}="vio_type --export $devpath"
-ENV{VIO_TYPE}=="serial",		RUN+="/sbin/modprobe -b hvc_console"
-ENV{VIO_TYPE}=="serial-server",		RUN+="/sbin/modprobe -b hvcs"
-ENV{VIO_TYPE}=="network",		RUN+="/sbin/modprobe -b ibmveth"
-ENV{VIO_TYPE}=="vscsi",			RUN+="/sbin/modprobe -b ibmvscsic"
-ENV{VIO_TYPE}=="vlan",			RUN+="/sbin/modprobe -b iseries_veth"
-ENV{VIO_TYPE}=="viodasd",		RUN+="/sbin/modprobe -b viodasd"
-ENV{VIO_TYPE}=="viocd",			RUN+="/sbin/modprobe -b viocd"
-ENV{VIO_TYPE}=="vnet",			RUN+="/sbin/modprobe -b sunvnet"
-ENV{VIO_TYPE}=="vdisk",			RUN+="/sbin/modprobe -b sunvdc"
-LABEL="hotplug_vio_end"
-
-# From here on follows the hotplug agents which do not load modules
-LABEL="hotplug_driver_loaded"
-
-LABEL="drivers_end"
-
-# Log every event to /dev/hotplug.log (for debugging).
-#SUBSYSTEM!="uids",			RUN+="logger.agent"
-

debian/patches/0050-Load-sg-module-from-80-drivers.rules.patch

+From: Martin Pitt <martin.pitt@ubuntu.com>
+Date: Sat, 26 Apr 2014 14:16:06 +0200
+Subject: Load sg module from 80-drivers.rules
+
+Taken from the Debian specific rules, this is the remaining difference over the
+upstream 80-drivers.rules.
+
+Bug-Debian: http://bugs.debian.org/657948
+---
+ rules/80-drivers.rules | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/rules/80-drivers.rules b/rules/80-drivers.rules
+index 50523e4..01760ef 100644
+--- a/rules/80-drivers.rules
++++ b/rules/80-drivers.rules
+@@ -9,5 +9,6 @@ SUBSYSTEM=="memstick", RUN{builtin}="kmod load ms_block mspro_block"
+ SUBSYSTEM=="i2o", RUN{builtin}="kmod load i2o_block"
+ SUBSYSTEM=="module", KERNEL=="parport_pc", RUN{builtin}="kmod load ppdev"
+ KERNEL=="mtd*ro", ENV{MTD_FTL}=="smartmedia", RUN{builtin}="kmod load sm_ftl"
++SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="kmod sg"
+ 
+ LABEL="drivers_end"

debian/patches/series

@@ -47,3 +47,4 @@
 0047-ignore-chkconfig-headers-entirely-they-are-often-bro.patch
 0048-Fix-mounting-of-remote-filesystems-like-NFS.patch
 0049-Order-remote-fs.target-after-local-fs.target.patch
+0050-Load-sg-module-from-80-drivers.rules.patch

debian/rules

@@ -100,7 +100,6 @@ override_dh_install:
 		debian/extra/rules/50-udev-default.rules \
 		debian/extra/rules/75-cd-aliases-generator.rules \
 		debian/extra/rules/75-persistent-net-generator.rules \
-		debian/extra/rules/80-drivers.rules \
 		debian/extra/rules/91-permissions.rules \
 		debian/udev-udeb/lib/udev/rules.d/
 	install -D --mode=644 debian/extra/links.conf \

debian/udev-udeb.install

@@ -9,3 +9,4 @@ lib/udev/rules.d/60-persistent-input.rules
 lib/udev/rules.d/60-persistent-storage.rules
 lib/udev/rules.d/64-btrfs.rules
 lib/udev/rules.d/75-probe_mtd.rules
+lib/udev/rules.d/80-drivers.rules