summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-08-08 09:18:49 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-08-08 09:18:49 +0000
commitcd5c21904504356d192d3863a1b9118869400f7f (patch)
treec8cf2cd316a4d2caf3a8d6e14180cd7451f62ea2 /images
parent02b39af06aae17ed20594aa8842a47edbb75eb93 (diff)
downloaddrakx-cd5c21904504356d192d3863a1b9118869400f7f.tar
drakx-cd5c21904504356d192d3863a1b9118869400f7f.tar.gz
drakx-cd5c21904504356d192d3863a1b9118869400f7f.tar.bz2
drakx-cd5c21904504356d192d3863a1b9118869400f7f.tar.xz
drakx-cd5c21904504356d192d3863a1b9118869400f7f.zip
- add modules.alias in /modules/<version> as required by stage2 with new libldetect
Diffstat (limited to 'images')
-rw-r--r--images/NEWS1
-rwxr-xr-ximages/make_boot_img12
2 files changed, 9 insertions, 4 deletions
diff --git a/images/NEWS b/images/NEWS
index 31496ebbb..bed59e4e6 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,4 @@
+- add modules.alias in /modules/<version> as required by stage2 with new libldetect
- add unionfs module
- revert isolinux starting install by default instead of booting on harddrive (#32040)
diff --git a/images/make_boot_img b/images/make_boot_img
index 1dab04546..ed56e0ec3 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -160,10 +160,14 @@ sub initrd {
mkdir_p("$tmp_initrd/etc/pcmcia");
_ "cp -a /etc/pcmcia/config.opts $tmp_initrd/etc/pcmcia";
}
- my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)";
- my $modz = "all.kernels$I/$ext";
- __ "tar xC $tmp_initrd/modules -f $modz/${type}_modules.tar";
- _ "cp -f $modz/modules.dep modules.description $tmp_initrd/modules/";
+ {
+ my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)";
+ my $modz = "all.kernels$I/$ext";
+ mkdir_p("$tmp_initrd/modules/$ext");
+ __ "tar xC $tmp_initrd/modules -f $modz/${type}_modules.tar";
+ _ "cp -f $modz/modules.dep $modz/modules.alias modules.description $tmp_initrd/modules/$ext";
+ symlink "$ext/$_", "$tmp_initrd/modules/$_" foreach qw(modules.dep modules.description);
+ }
if ($ENV{DEBUGSTAGE1}) {
_ "cp -f /usr/bin/busybox $tmp_initrd/sbin";