summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--images/NEWS2
-rw-r--r--images/dracut.conf4
-rwxr-xr-ximages/make_boot_img3
3 files changed, 7 insertions, 2 deletions
diff --git a/images/NEWS b/images/NEWS
index 3cf924b06..84ab15c8a 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- 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
Version 1.94 - 29 October 2013 by Colin Guthrie
diff --git a/images/dracut.conf b/images/dracut.conf
new file mode 100644
index 000000000..61b2e5636
--- /dev/null
+++ b/images/dracut.conf
@@ -0,0 +1,4 @@
+hostonly=no
+nofscks=yes
+omit_dracutmodules+=" dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname usrmount shutdown "
+compress=xz
diff --git a/images/make_boot_img b/images/make_boot_img
index 2be5bbde5..b0e3eec70 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -161,9 +161,8 @@ sub initrd {
$modules="$modules mgakadeploy " if ($ENV{BUILD_KA});
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 ' --add-drivers ' $drivers ' '$img' '$kernel'"
+ __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' '$img' '$kernel'"
}