summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-17 17:59:13 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-17 17:59:13 +0000
commitb463c0893f96581e357f2b2c4ca2f7844f0143f2 (patch)
tree468892eae0524b02d4a0d82e3093804681ec1380
parent7d933df4392665ecbd9ba1eefe63d9e821bb9043 (diff)
downloaddrakx-backup-do-not-use-b463c0893f96581e357f2b2c4ca2f7844f0143f2.tar
drakx-backup-do-not-use-b463c0893f96581e357f2b2c4ca2f7844f0143f2.tar.gz
drakx-backup-do-not-use-b463c0893f96581e357f2b2c4ca2f7844f0143f2.tar.bz2
drakx-backup-do-not-use-b463c0893f96581e357f2b2c4ca2f7844f0143f2.tar.xz
drakx-backup-do-not-use-b463c0893f96581e357f2b2c4ca2f7844f0143f2.zip
use new hotplug (mga#6323)
-rw-r--r--images/NEWS1
-rwxr-xr-ximages/make_boot_img17
2 files changed, 2 insertions, 16 deletions
diff --git a/images/NEWS b/images/NEWS
index ff0126c03..968639069 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,4 +1,5 @@
- fix modules.order so that cciss got detected (mga#5833)
+- use new hotplug (mga#6323)
Version 1.82 - 12 September 2012 by Thierry Vignaud
diff --git a/images/make_boot_img b/images/make_boot_img
index 1c506b471..517d959ec 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -170,22 +170,7 @@ sub initrd {
_ "cp -a $firm $tmp_initrd/$dest";
}
- output("$tmp_initrd/hotplug", q{#!/bin/sh
-if [ "$SUBSYSTEM" = firmware ] && [ "$ACTION" = add ] && [ -n "$FIRMWARE" ] ; then
- if [ ! -e /sys$DEVPATH/loading ]; then
- exit 1
- fi
- if [ -e "/lib/firmware/$FIRMWARE" ]; then
- echo 1 > /sys$DEVPATH/loading
- cat "/lib/firmware/$FIRMWARE" > /sys$DEVPATH/data
- echo 0 > /sys$DEVPATH/loading
- exit 0
- fi
- echo -1 > /sys$DEVPATH/loading
- exit 1
-fi
-});
- _ "chmod 755 $tmp_initrd/hotplug";
+ _ "install $stage1_root/hotplug $tmp_initrd/";
symlink "../hotplug", "$tmp_initrd/sbin/hotplug";
_ "install $stage1_root/init $tmp_initrd/";
_ "install $stage1_root/stage1 $tmp_initrd/sbin/";