diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-04-14 18:21:17 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-04-14 18:21:17 +0000 |
| commit | cdff5c031067c2bd1658774e4bfa75d0a2507da6 (patch) | |
| tree | 5e25283482bf0d318f4401a7f0153fea0dbf434b | |
| parent | d77b7c2e917bc3f766146059db21b371f1ae4e56 (diff) | |
| download | drakx-cdff5c031067c2bd1658774e4bfa75d0a2507da6.tar drakx-cdff5c031067c2bd1658774e4bfa75d0a2507da6.tar.gz drakx-cdff5c031067c2bd1658774e4bfa75d0a2507da6.tar.bz2 drakx-cdff5c031067c2bd1658774e4bfa75d0a2507da6.tar.xz drakx-cdff5c031067c2bd1658774e4bfa75d0a2507da6.zip | |
- handle firmware loading in stage2 too
| -rw-r--r-- | images/NEWS | 2 | ||||
| -rwxr-xr-x | images/make_boot_img | 8 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/install/share/aliases | 2 |
4 files changed, 10 insertions, 3 deletions
diff --git a/images/NEWS b/images/NEWS index 869e65c03..df8dca0f1 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,5 @@ +- handle firmware loading in stage2 too + Version 1.39 - 6 April 2009, by Pascal Terjan - fix firmware helper generation diff --git a/images/make_boot_img b/images/make_boot_img index b66208acf..d0d13309b 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -143,8 +143,9 @@ sub initrd { my $stage1_root = $ENV{DEBUGSTAGE1} ? "../mdk-stage1" : "/usr/$lib/drakx-installer-binaries"; _ "rm -rf $tmp_initrd"; - mkdir_p("$tmp_initrd$_") foreach qw(/etc /lib/firmware /modules /sbin /tmp /var); + mkdir_p("$tmp_initrd$_") foreach qw(/etc /firmware /lib /modules /sbin /tmp /var); symlink "../modules", "$tmp_initrd/lib/modules"; + symlink "../firmware", "$tmp_initrd/lib/firmware"; symlink "/proc/mounts", "$tmp_initrd/etc/mtab"; symlink "../tmp", "$tmp_initrd/var/run"; @@ -163,7 +164,7 @@ sub initrd { _ "cp -a $_ $tmp_initrd$_"; }; - output("$tmp_initrd/sbin/hotplug", q{#!/bin/sh -e + output("$tmp_initrd/hotplug", q{#!/bin/sh -e if [ "$SUBSYSTEM" = firmware ] && [ "$ACTION" = add ] && [ -n "$FIRMWARE" ] ; then if [ ! -e /sys\$DEVPATH/loading ]; then exit 1 @@ -178,7 +179,8 @@ if [ "$SUBSYSTEM" = firmware ] && [ "$ACTION" = add ] && [ -n "$FIRMWARE" ] ; th exit 1 fi }); - _ "chmod 755 $tmp_initrd/sbin/hotplug"; + _ "chmod 755 $tmp_initrd/hotplug"; + symlink "../hotplug", "$tmp_initrd/sbin/hotplug"; _ "install $stage1_root/init $tmp_initrd/"; foreach ('stage1', 'pppd', 'pppoe') { _ "install $stage1_root/$_ $tmp_initrd/sbin/"; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index ae38bf2a5..42d471ffc 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,5 @@ - be more compatible with older http code for error management +- handle firmware loading in stage2 too Version 12.26.2 - 08 April 2009 diff --git a/perl-install/install/share/aliases b/perl-install/install/share/aliases index 792566cd9..de852a835 100644 --- a/perl-install/install/share/aliases +++ b/perl-install/install/share/aliases @@ -4,4 +4,6 @@ /usr/bin/runinstall2 install2 /sbin/fsck.ext2 e2fsck /lib/modules /modules +/lib/firmware /firmware +/sbin/hotplug /hotplug /usr/share/X11/xkb/compiled /tmp |