From f81fb02404bac828f6ce6bda79316f88a91fb96d Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Wed, 21 May 2025 10:12:49 +0100 Subject: [PATCH 1/2] Do not include the root= dracut config in PXE images --- live/src/config.sh | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/live/src/config.sh b/live/src/config.sh index 14ae2652ca..7ad282b04e 100644 --- a/live/src/config.sh +++ b/live/src/config.sh @@ -98,13 +98,16 @@ arch=$(uname -m) profile=$(echo "$kiwi_profiles" | tr "_" "-") label="Install-$profile-$arch" -echo "Setting default live root: live:LABEL=$label" -mkdir /etc/cmdline.d -echo "root=live:LABEL=$label" >/etc/cmdline.d/10-liveroot.conf -echo "root_disk=live:LABEL=$label" >>/etc/cmdline.d/10-liveroot.conf -# if there's a default network location, add it here -# echo "root_net=" >> /etc/cmdline.d/10-liveroot.conf -echo 'install_items+=" /etc/cmdline.d/10-liveroot.conf "' >/etc/dracut.conf.d/10-liveroot-file.conf +# Extra cleanup for the PXE images +if [[ "$kiwi_profiles" == *PXE* ]]; then + echo "Setting default live root: live:LABEL=$label" + mkdir /etc/cmdline.d + echo "root=live:LABEL=$label" >/etc/cmdline.d/10-liveroot.conf + echo "root_disk=live:LABEL=$label" >>/etc/cmdline.d/10-liveroot.conf + # if there's a default network location, add it here + # echo "root_net=" >> /etc/cmdline.d/10-liveroot.conf + echo 'install_items+=" /etc/cmdline.d/10-liveroot.conf "' >/etc/dracut.conf.d/10-liveroot-file.conf +fi echo 'add_dracutmodules+=" dracut-menu agama-cmdline "' >>/etc/dracut.conf.d/10-liveroot-file.conf # decrease the kernel logging on the console, use a dracut module to do it early in the boot process From f57d8e3b3f69783bd17553e8c16afae1a4b86341 Mon Sep 17 00:00:00 2001 From: Knut Anderssen Date: Wed, 21 May 2025 13:49:58 +0100 Subject: [PATCH 2/2] Added changelog --- live/src/agama-installer.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/live/src/agama-installer.changes b/live/src/agama-installer.changes index 9b5de203f7..54eaa61afc 100644 --- a/live/src/agama-installer.changes +++ b/live/src/agama-installer.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 21 12:42:34 UTC 2025 - Knut Anderssen + +- Do not set root= dracut configuration in PXE images + (gh#agama-project/agama2377). + ------------------------------------------------------------------- Tue May 20 08:42:29 UTC 2025 - Ladislav Slezák