From 1e83a27a574b0bb3ec1de2f82f8c253dbf2d20b5 Mon Sep 17 00:00:00 2001 From: Thomas Stallinger Date: Wed, 22 Jul 2026 12:12:23 +0200 Subject: [PATCH] fix: match GRUB search label to the TUXFLOTTE ISO volume ID The GRUB config searched for the volume by the original Fedora label (Fedora-Cinn-Live-44), which no longer matches once the ISO is built with its own Tuxflotte volume ID. Co-Authored-By: Claude Sonnet 5 --- grub/EFI-BOOT-grub.cfg | 6 +++--- grub/boot-grub2-grub.cfg | 6 +++--- scripts/build.sh | 1 + 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/grub/EFI-BOOT-grub.cfg b/grub/EFI-BOOT-grub.cfg index 28c3fe4..722a29d 100644 --- a/grub/EFI-BOOT-grub.cfg +++ b/grub/EFI-BOOT-grub.cfg @@ -17,7 +17,7 @@ insmod ext2 set timeout=10 ### END /etc/grub.d/00_header ### -search --no-floppy --set=root -l 'Fedora-Cinn-Live-44' +search --no-floppy --set=root -l 'TUXFLOTTE' insmod gfxterm terminal_output gfxterm @@ -26,12 +26,12 @@ set color_highlight=white/blue ### BEGIN /etc/grub.d/10_linux ### menuentry 'Tuxflotte Provisioning (automatisch)' --class fedora --class gnu-linux --class gnu --class os { - linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image vconsole.keymap=de tuxflotte.mode=auto + linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=TUXFLOTTE rd.live.image vconsole.keymap=de tuxflotte.mode=auto initrd /boot/x86_64/loader/initrd } menuentry 'Tuxflotte Provisioning (interaktiv)' --class fedora --class gnu-linux --class gnu --class os { - linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image vconsole.keymap=de tuxflotte.mode=interactive + linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=TUXFLOTTE rd.live.image vconsole.keymap=de tuxflotte.mode=interactive initrd /boot/x86_64/loader/initrd } diff --git a/grub/boot-grub2-grub.cfg b/grub/boot-grub2-grub.cfg index 5c47212..56aff56 100644 --- a/grub/boot-grub2-grub.cfg +++ b/grub/boot-grub2-grub.cfg @@ -14,7 +14,7 @@ insmod chain set timeout=10 ### END /etc/grub.d/00_header ### -search --no-floppy --set=root -l 'Fedora-Cinn-Live-44' +search --no-floppy --set=root -l 'TUXFLOTTE' insmod gfxterm terminal_output gfxterm @@ -23,12 +23,12 @@ set color_highlight=white/blue ### BEGIN /etc/grub.d/10_linux ### menuentry 'Tuxflotte Provisioning (automatisch)' --class fedora --class gnu-linux --class gnu --class os { - linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image vconsole.keymap=de tuxflotte.mode=auto + linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=TUXFLOTTE rd.live.image vconsole.keymap=de tuxflotte.mode=auto initrd /boot/x86_64/loader/initrd } menuentry 'Tuxflotte Provisioning (interaktiv)' --class fedora --class gnu-linux --class gnu --class os { - linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=Fedora-Cinn-Live-44 rd.live.image vconsole.keymap=de tuxflotte.mode=interactive + linux /boot/x86_64/loader/linux quiet rhgb root=live:CDLABEL=TUXFLOTTE rd.live.image vconsole.keymap=de tuxflotte.mode=interactive initrd /boot/x86_64/loader/initrd } diff --git a/scripts/build.sh b/scripts/build.sh index fdcde8e..847e5ac 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -91,6 +91,7 @@ create_iso() { -indev "$SOURCE_ISO" \ -outdev "$output_iso" \ -compliance no_emul_toc \ + -volid TUXFLOTTE \ -map "$REPO_DIR/grub/EFI-BOOT-grub.cfg" /EFI/BOOT/grub.cfg \ -map "$REPO_DIR/grub/boot-grub2-grub.cfg" /boot/grub2/grub.cfg \ -map "$WORK_DIR/updates" /updates \