diff options
| -rw-r--r-- | images/Makefile | 2 | ||||
| -rw-r--r-- | images/NEWS | 5 | ||||
| -rw-r--r-- | images/dracut.conf.d/01-dist.conf (renamed from images/dracut.conf) | 0 | ||||
| -rwxr-xr-x | images/make_boot_img | 3 |
4 files changed, 7 insertions, 3 deletions
diff --git a/images/Makefile b/images/Makefile index 5ac5cf59c..9dee2d409 100644 --- a/images/Makefile +++ b/images/Makefile @@ -1,6 +1,6 @@ include ../Makefile.config -VERSION=2.92 +VERSION=2.93 PRODUCT=drakx-installer-images KERNELS=$(shell rpm -qf /lib/modules/6.*) diff --git a/images/NEWS b/images/NEWS index d08d5d491..749af6570 100644 --- a/images/NEWS +++ b/images/NEWS @@ -1,3 +1,8 @@ +Version 2.93 - 25 October 2025 by Jani Välimaa +- 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.d/01-dist.conf index 88efd9a14..88efd9a14 100644 --- a/images/dracut.conf +++ b/images/dracut.conf.d/01-dist.conf 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); } |