summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-04-06 09:09:01 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-04-06 09:09:01 +0000
commitb1085ec8e30ba9f79eeacdd35c98f9a06a64eabc (patch)
treedc4f660d3f821d01a981c1a51699ed6d09c27522
parentdc28b4420ed4a43dc2d9560a7154f560446c9b88 (diff)
downloaddrakx-b1085ec8e30ba9f79eeacdd35c98f9a06a64eabc.tar
drakx-b1085ec8e30ba9f79eeacdd35c98f9a06a64eabc.tar.gz
drakx-b1085ec8e30ba9f79eeacdd35c98f9a06a64eabc.tar.bz2
drakx-b1085ec8e30ba9f79eeacdd35c98f9a06a64eabc.tar.xz
drakx-b1085ec8e30ba9f79eeacdd35c98f9a06a64eabc.zip
fix firmware helper generation
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img5
2 files changed, 4 insertions, 3 deletions
diff --git a/images/NEWS b/images/NEWS
index f65ad9935..0a7b16b38 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- fix firmware helper generation
+
Version 1.38 - 3 April 2009, by Thierry Vignaud
- include firmwares for most common network cards (#49195)
diff --git a/images/make_boot_img b/images/make_boot_img
index 246eb9de1..b66208acf 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -163,9 +163,8 @@ sub initrd {
_ "cp -a $_ $tmp_initrd$_";
};
- output("$tmp_initrd/sbin/hotplug", q{
-#!/bin/sh -e
-if [ \$SUBSYSTEM = firmware ] && [ \$ACTION = add ] && [ -n "\$FIRMWARE" ] ; then
+ output("$tmp_initrd/sbin/hotplug", q{#!/bin/sh -e
+if [ "$SUBSYSTEM" = firmware ] && [ "$ACTION" = add ] && [ -n "$FIRMWARE" ] ; then
if [ ! -e /sys\$DEVPATH/loading ]; then
exit 1
fi