From cd5c21904504356d192d3863a1b9118869400f7f Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Wed, 8 Aug 2007 09:18:49 +0000
Subject: - add modules.alias in /modules/<version> as required by stage2 with
 new libldetect

---
 images/NEWS          |  1 +
 images/make_boot_img | 12 ++++++++----
 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";
-- 
cgit v1.2.1