From 2df68d93aa83b7d2165bb1df42b39523f80d8052 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Sat, 2 Nov 2013 11:45:34 +0000 Subject: images: Omit the dracut network module now that we include our own networking kernel modules --- images/NEWS | 1 + images/dracut.conf | 2 +- images/make_boot_img | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/images/NEWS b/images/NEWS index 84ab15c8a..3d8935d60 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,4 @@ +- omit the dracut network module now that we include our own networking kernel modules - add a dracut.conf rather than adding lots of command line options - ensure initrd is xz compressed - include network modules as specified by kernel/list_modules.pm diff --git a/images/dracut.conf b/images/dracut.conf index 61b2e5636..a1fd05e18 100644 --- a/images/dracut.conf +++ b/images/dracut.conf @@ -1,4 +1,4 @@ hostonly=no nofscks=yes -omit_dracutmodules+=" dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname usrmount shutdown " +omit_dracutmodules+=" dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname usrmount shutdown network " compress=xz diff --git a/images/make_boot_img b/images/make_boot_img index b0e3eec70..5325d2cf6 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -152,7 +152,7 @@ sub initrd { my $stage1_binary = $ENV{USE_LOCAL_STAGE1} ? trim(`realpath ../mdk-stage1/stage1`) : ""; 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 $modules = " mgainstaller "; my $drivers = `perl ../kernel/modules.pl list_needed_modules $kernel | xargs`; if ($ENV{DEBUGSTAGE1} || $ENV{BUILD_KA}) { -- cgit v1.2.1