summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <blino@mageia.org>2012-05-16 22:12:42 +0000
committerOlivier Blin <blino@mageia.org>2012-05-16 22:12:42 +0000
commitb34c6140c466f02b554d178b37482d1dc94aba31 (patch)
treec8783c57057dd87b3809d91a6d47d45a623ecf10
parentb2a95e8568ac7c1040f731a68189269daca04b65 (diff)
downloaddrakx-b34c6140c466f02b554d178b37482d1dc94aba31.tar
drakx-b34c6140c466f02b554d178b37482d1dc94aba31.tar.gz
drakx-b34c6140c466f02b554d178b37482d1dc94aba31.tar.bz2
drakx-b34c6140c466f02b554d178b37482d1dc94aba31.tar.xz
drakx-b34c6140c466f02b554d178b37482d1dc94aba31.zip
add modules.order and modules.builtin in initrd
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img2
2 files changed, 4 insertions, 0 deletions
diff --git a/images/NEWS b/images/NEWS
index 99bd44eb1..ab2d650ba 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- add modules.order and modules.builtin in initrd
+
Version 1.74 - 5 April 2012 by Thierry Vignaud
- include "fuse" module (mga#5685)
diff --git a/images/make_boot_img b/images/make_boot_img
index 935d44e1e..a31a01b6f 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -202,6 +202,8 @@ fi
my $modz = "all.kernels$I/$ext";
mkdir_p("$tmp_initrd/modules/$ext");
__ "tar xC $tmp_initrd/modules/$ext -f $modz/${type}_modules.tar";
+ _ "cp -f $modz/modules.$_ $tmp_initrd/modules/$ext" foreach qw(order builtin);
+ substInFile { s,.*/,, } "$tmp_initrd/modules/$ext/modules.order";
_ "depmod -b $tmp_initrd $ext";
# depmod keeps only available modules in modules.alias, but we want them all
_ "cp -f $modz/modules.alias $modz/modules.description $tmp_initrd/modules/$ext";