summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-10-04 05:55:19 +0000
committerThierry Vignaud <tv@mageia.org>2012-10-04 05:55:19 +0000
commit8e7a932ca210c00801c9466791ca3882a5d10d51 (patch)
tree8cabf4ecb3feca61f69edad0852dbfe8c912600b
parentb19bb51682dd1040e56bb8917301ab14ed49471e (diff)
downloaddrakx-8e7a932ca210c00801c9466791ca3882a5d10d51.tar
drakx-8e7a932ca210c00801c9466791ca3882a5d10d51.tar.gz
drakx-8e7a932ca210c00801c9466791ca3882a5d10d51.tar.bz2
drakx-8e7a932ca210c00801c9466791ca3882a5d10d51.tar.xz
drakx-8e7a932ca210c00801c9466791ca3882a5d10d51.zip
no more need to fix modules.order
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img2
2 files changed, 3 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index e57993813..369cb1e44 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- no more need to fix modules.order
+
Version 1.83 - 17 September 2012 by Thierry Vignaud
- fix modules.order so that cciss got detected (mga#5833)
diff --git a/images/make_boot_img b/images/make_boot_img
index 517d959ec..29b60a6af 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -187,7 +187,7 @@ sub initrd {
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,.*/,,; s,ko$,ko.xz, } "$tmp_initrd/modules/$ext/modules.order";
+ 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";