From 4390acee98708ff75d00685995ac7dd40d0b3f5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jani=20V=C3=A4limaa?= Date: Sat, 25 Oct 2025 12:56:02 +0300 Subject: images: fix image build with new dracut distro config location --- images/NEWS | 4 ++++ images/dracut.conf | 4 ---- images/dracut.conf.d/01-dist.conf | 4 ++++ images/make_boot_img | 3 +-- 4 files changed, 9 insertions(+), 6 deletions(-) delete mode 100644 images/dracut.conf create mode 100644 images/dracut.conf.d/01-dist.conf diff --git a/images/NEWS b/images/NEWS index d08d5d491..6dc81585f 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,7 @@ +- fix image build with dracut >= 108-8 + * default distro config was moved into /usr/lib/dracut/dracut.conf.d and + renamed as 01-dist.conf + Version 2.92 - 18 October 2025 by Jani Välimaa - remove 'Memory Test' from boot images as we don't have linux32 module anymore in grub2 diff --git a/images/dracut.conf b/images/dracut.conf deleted file mode 100644 index 88efd9a14..000000000 --- a/images/dracut.conf +++ /dev/null @@ -1,4 +0,0 @@ -hostonly=no -nofscks=yes -omit_dracutmodules+=" dash modsign systemd plymouth btrfs crypt lvm cifs resume rootfs-block biosdevname usrmount shutdown " -compress="zstd -14" diff --git a/images/dracut.conf.d/01-dist.conf b/images/dracut.conf.d/01-dist.conf new file mode 100644 index 000000000..88efd9a14 --- /dev/null +++ b/images/dracut.conf.d/01-dist.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="zstd -14" diff --git a/images/make_boot_img b/images/make_boot_img index 31af50744..6953b02df 100755 --- a/images/make_boot_img +++ b/images/make_boot_img @@ -159,9 +159,8 @@ sub initrd { chomp $extras; my $install_extras = $extras ? "--install '$extras'" : ""; - mkdir_p("build/dracut.conf.d"); # 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 DRAKX_FAKE_MODULES='$fakedrivers' dracut --conf dracut.conf --confdir ./build/dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' $install_extras '$img' '$kernel'"; + __ "DRAKX_STAGE1_BINARY=$stage1_binary DRAKX_INIT_BINARY=$init_binary DRAKX_FAKE_MODULES='$fakedrivers' dracut --confdir ./dracut.conf.d --add ' $modules ' --add-drivers ' $drivers ' $install_extras '$img' '$kernel'"; chmod(0644, $img); } -- cgit v1.2.1