admin/tuxflotte-installer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: match GRUB search label to the TUXFLOTTE ISO volume ID

Browse Source 
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 <noreply@anthropic.com>
This commit is contained in:
Thomas Stallinger 2026-07-22 12:12:23 +02:00
parent cd91a6b393
commit 1e83a27a57
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
grub/EFI-BOOT-grub.cfg
View File

@ -17,7 +17,7 @@ insmod ext2
set timeout=10 set timeout=10
### END /etc/grub.d/00_header ### ### 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 insmod gfxterm
terminal_output gfxterm terminal_output gfxterm
@ -26,12 +26,12 @@ set color_highlight=white/blue
### BEGIN /etc/grub.d/10_linux ### ### BEGIN /etc/grub.d/10_linux ###
menuentry 'Tuxflotte Provisioning (automatisch)' --class fedora --class gnu-linux --class gnu --class os { 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 initrd /boot/x86_64/loader/initrd
} }
menuentry 'Tuxflotte Provisioning (interaktiv)' --class fedora --class gnu-linux --class gnu --class os { 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 initrd /boot/x86_64/loader/initrd
} }

6
grub/boot-grub2-grub.cfg
View File

@ -14,7 +14,7 @@ insmod chain
set timeout=10 set timeout=10
### END /etc/grub.d/00_header ### ### 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 insmod gfxterm
terminal_output gfxterm terminal_output gfxterm
@ -23,12 +23,12 @@ set color_highlight=white/blue
### BEGIN /etc/grub.d/10_linux ### ### BEGIN /etc/grub.d/10_linux ###
menuentry 'Tuxflotte Provisioning (automatisch)' --class fedora --class gnu-linux --class gnu --class os { 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 initrd /boot/x86_64/loader/initrd
} }
menuentry 'Tuxflotte Provisioning (interaktiv)' --class fedora --class gnu-linux --class gnu --class os { 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 initrd /boot/x86_64/loader/initrd
} }

1
scripts/build.sh
View File

@ -91,6 +91,7 @@ create_iso() {
-indev "$SOURCE_ISO" \ -indev "$SOURCE_ISO" \
-outdev "$output_iso" \ -outdev "$output_iso" \
-compliance no_emul_toc \ -compliance no_emul_toc \
-volid TUXFLOTTE \
-map "$REPO_DIR/grub/EFI-BOOT-grub.cfg" /EFI/BOOT/grub.cfg \ -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 "$REPO_DIR/grub/boot-grub2-grub.cfg" /boot/grub2/grub.cfg \
-map "$WORK_DIR/updates" /updates \ -map "$WORK_DIR/updates" /updates \