summaryrefslogtreecommitdiffstats
path: root/images
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-11-01 10:35:03 +0000
committerColin Guthrie <colin@mageia.org>2013-11-02 11:47:27 +0000
commit284ba5ab6fc742dd3f7a5a4705207f9b2d4de5be (patch)
tree18eb615cabb1ea6cee90c1ef7b6fe01812c1c0dd /images
parent74cc75140329a03e5ed6f952932f8ea937216209 (diff)
downloaddrakx-284ba5ab6fc742dd3f7a5a4705207f9b2d4de5be.tar
drakx-284ba5ab6fc742dd3f7a5a4705207f9b2d4de5be.tar.gz
drakx-284ba5ab6fc742dd3f7a5a4705207f9b2d4de5be.tar.bz2
drakx-284ba5ab6fc742dd3f7a5a4705207f9b2d4de5be.tar.xz
drakx-284ba5ab6fc742dd3f7a5a4705207f9b2d4de5be.zip
images/kernel: Ensure the previously hand-picked modules are included in the new dracut-based initrd.
This removes functions no longer called and adds a new one which will simply list the desired modules and pass them on the dracut command line. This should mean we have the same modules as before (at least) which should mean less regressions. This does increase the size of the initrd back up quite a lot (as expected) so we may want to look at optimising other areas to bring it back down a bit again.
Diffstat (limited to 'images')
-rw-r--r--images/NEWS2
-rwxr-xr-ximages/make_boot_img3
2 files changed, 4 insertions, 1 deletions
diff --git a/images/NEWS b/images/NEWS
index 11b33e10a..3cf924b06 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- include network modules as specified by kernel/list_modules.pm
+
Version 1.94 - 29 October 2013 by Colin Guthrie
- adapt to a dracut based stage1
diff --git a/images/make_boot_img b/images/make_boot_img
index eb2146fa2..2be5bbde5 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -153,6 +153,7 @@ sub initrd {
my $init_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/init`) : "";
my ($ext) = $img =~ /rdz-(.*)/ or die "bad initrd name ($img)";
my $modules = " network mgainstaller ";
+ my $drivers = `perl ../kernel/modules.pl list_needed_modules $kernel | xargs`;
if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) {
$modules="$modules busybox ";
@@ -162,7 +163,7 @@ sub initrd {
mkdir_p("build/dracut.conf.d");
touch("build/dracut.conf");
# TODO if --nofscks and --no-hostonly are switched, dracut gives an error - fix or report upstream
- __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf ./build/dracut.conf --confdir ./build/dracut.conf.d --nofscks --no-hostonly --add ' $modules ' --omit ' dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname shutdown ' '$img' '$kernel'"
+ __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf ./build/dracut.conf --confdir ./build/dracut.conf.d --nofscks --no-hostonly --add ' $modules ' --omit ' dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname shutdown ' --add-drivers ' $drivers ' '$img' '$kernel'"
}