summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-17 17:59:03 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-17 17:59:03 +0000
commitf605d42f44ed046ab7152a680624165c837bbcfc (patch)
tree6c3f3fb175b813ea3d256e9bbf5d5d863be55df2 /images
parent140f4569c48acbec044ab828de2c75fd243e586e (diff)
downloaddrakx-f605d42f44ed046ab7152a680624165c837bbcfc.tar
drakx-f605d42f44ed046ab7152a680624165c837bbcfc.tar.gz
drakx-f605d42f44ed046ab7152a680624165c837bbcfc.tar.bz2
drakx-f605d42f44ed046ab7152a680624165c837bbcfc.tar.xz
drakx-f605d42f44ed046ab7152a680624165c837bbcfc.zip
fix modules.order so that cciss got detected (mga#5833)
rationale: sorting fails in depmod when modules are compressed
Diffstat (limited to 'images')
-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 5f5144723..ff0126c03 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- fix modules.order so that cciss got detected (mga#5833)
+
Version 1.82 - 12 September 2012 by Thierry Vignaud
- include overlayfs module instead of unionfs
diff --git a/images/make_boot_img b/images/make_boot_img
index 8855a552b..1c506b471 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -202,7 +202,7 @@ fi
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";
+ substInFile { s,.*/,,; s,ko$,ko.xz, } "$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";