diff options
| author | Colin Guthrie <colin@mageia.org> | 2013-11-02 10:11:01 +0000 |
|---|---|---|
| committer | Colin Guthrie <colin@mageia.org> | 2013-11-02 11:47:48 +0000 |
| commit | bbbb6c5bf26b764dfff8a83c2cc0ed3769bfdd74 (patch) | |
| tree | 50b4e83825d921915c5c2f320598428bf4c11cbb | |
| parent | 284ba5ab6fc742dd3f7a5a4705207f9b2d4de5be (diff) | |
| download | drakx-bbbb6c5bf26b764dfff8a83c2cc0ed3769bfdd74.tar drakx-bbbb6c5bf26b764dfff8a83c2cc0ed3769bfdd74.tar.gz drakx-bbbb6c5bf26b764dfff8a83c2cc0ed3769bfdd74.tar.bz2 drakx-bbbb6c5bf26b764dfff8a83c2cc0ed3769bfdd74.tar.xz drakx-bbbb6c5bf26b764dfff8a83c2cc0ed3769bfdd74.zip | |
images: Split dracut options out into a config file.
Also ensure that the compression method is xz -9 for much better compression
(was previously defaulting to gzip)
| -rw-r--r-- | images/NEWS | 2 | ||||
| -rw-r--r-- | images/dracut.conf | 4 | ||||
| -rwxr-xr-x | images/make_boot_img | 3 |
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'" } |