Add userspace firmware loader stub

Reinstate a debian/extra/rules/50-firmware.rules which immediately tells the
kernel that userspace firmware loading failed. Otherwise it tries for a minute
to call the userspace helper (if CONFIG_FW_LOADER_USER_HELPER is enabled) in
vain, which causes long delays with devices which have a range of possible
firmware versions. (LP: #1398458)

diff --git a/debian/changelog b/debian/changelog
index e74300d08ace541483443dd3ebb497740ad28b3f..b768c42d5f25c3da47673a20da12623f34004c2f 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+systemd (217-4) UNRELEASED; urgency=medium
+
+  * Reinstate a debian/extra/rules/50-firmware.rules which immediately tells
+    the kernel that userspace firmware loading failed. Otherwise it tries for a
+    minute to call the userspace helper (if CONFIG_FW_LOADER_USER_HELPER is
+    enabled) in vain, which causes long delays with devices which have a range
+    of possible firmware versions. (LP: #1398458)
+
+ -- Martin Pitt <mpitt@debian.org>  Tue, 02 Dec 2014 18:47:43 +0100
+
 systemd (217-3) experimental; urgency=medium
 
   [ Martin Pitt ]

diff --git a/debian/extra/initramfs.hook b/debian/extra/initramfs.hook
index 1dc2a8d29e44015158aee45bcaae8dbb83fb4202..33ac56f9dd77b846506b1df0c1070bbb1d0925e9 100644 (file)
--- a/debian/extra/initramfs.hook
+++ b/debian/extra/initramfs.hook
@@ -33,7 +33,7 @@ mkdir -p $DESTDIR/etc/udev
 cp -p /etc/udev/udev.conf $DESTDIR/etc/udev/
 
 mkdir -p $DESTDIR/lib/udev/rules.d/
-for rules in 50-udev-default.rules 60-persistent-storage.rules \
+for rules in 50-firmware.rules 50-udev-default.rules 60-persistent-storage.rules \
        80-drivers.rules \
        64-md-raid.rules 60-persistent-storage-lvm.rules \
        55-dm.rules 60-persistent-storage-dm.rules; do

diff --git a/debian/extra/rules/50-firmware.rules b/debian/extra/rules/50-firmware.rules
new file mode 100644 (file)
index 0000000..f7a08ce
--- /dev/null
+++ b/debian/extra/rules/50-firmware.rules
@@ -0,0 +1,3 @@
+# stub for immediately telling the kernel that userspace firmware loading
+# failed; necessary to avoid long timeouts with CONFIG_FW_LOADER_USER_HELPER=y
+SUBSYSTEM=="firmware", ACTION=="add", ATTR{loading}="-1"

diff --git a/debian/rules b/debian/rules
index 9e9f5f1f8f2703b7a22d744d335780a608a80e5a..454d148c266e472168ba929d02f7b6e0fce1f69c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -153,6 +153,7 @@ override_dh_install:
                debian/udev-udeb/usr/lib/base-installer.d/05udev
        mkdir -p debian/udev-udeb/lib/udev/rules.d/
        install -D --mode=644 \
+               debian/extra/rules/50-firmware.rules \
                debian/extra/rules/73-idrac.rules \
                debian/extra/rules/75-persistent-net-generator.rules \
                debian/udev-udeb/lib/udev/rules.d/