diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-17 17:59:13 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-17 17:59:13 +0000 |
| commit | f35b14f2ac2f3d1c18337b88cbd11ee67419df87 (patch) | |
| tree | 468892eae0524b02d4a0d82e3093804681ec1380 | |
| parent | 1fafb5db1fef31698b04a248699cd45f55f49ec1 (diff) | |
| download | drakx-f35b14f2ac2f3d1c18337b88cbd11ee67419df87.tar drakx-f35b14f2ac2f3d1c18337b88cbd11ee67419df87.tar.gz drakx-f35b14f2ac2f3d1c18337b88cbd11ee67419df87.tar.bz2 drakx-f35b14f2ac2f3d1c18337b88cbd11ee67419df87.tar.xz drakx-f35b14f2ac2f3d1c18337b88cbd11ee67419df87.zip | |
use new hotplug (mga#6323)
| -rw-r--r-- | images/NEWS | 1 | ||||
| -rwxr-xr-x | images/make_boot_img | 17 |
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/"; |