summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-11-02 11:45:34 +0000
committerColin Guthrie <colin@mageia.org>2013-11-02 11:47:50 +0000
commit2df68d93aa83b7d2165bb1df42b39523f80d8052 (patch)
tree614ab4d3647a170c96daaac25dd59f1984a38f71
parentbbbb6c5bf26b764dfff8a83c2cc0ed3769bfdd74 (diff)
downloaddrakx-2df68d93aa83b7d2165bb1df42b39523f80d8052.tar
drakx-2df68d93aa83b7d2165bb1df42b39523f80d8052.tar.gz
drakx-2df68d93aa83b7d2165bb1df42b39523f80d8052.tar.bz2
drakx-2df68d93aa83b7d2165bb1df42b39523f80d8052.tar.xz
drakx-2df68d93aa83b7d2165bb1df42b39523f80d8052.zip
images: Omit the dracut network module now that we include our own networking kernel modules
-rw-r--r--images/NEWS1
-rw-r--r--images/dracut.conf2
-rwxr-xr-ximages/make_boot_img2
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}) {