Script generated boot menu for all arches #1613
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,102 @@ | ||
| #! /bin/bash | ||
|
|
||
| # Custom menu to ensure that we boot correctly | ||
| # from local disk on UEFI | ||
| # https://github.com/openSUSE/agama/issues/1609 | ||
| # KIWI config | ||
|
|
||
| dst="$1" | ||
|
|
||
| if [ ! -d "$dst" ] ; then | ||
| echo "fix_bootconfig.aarch64: image dir \"$dst\" not found" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # KIWI config which should normally be inherited | ||
| # from a parent process in our case xorriso | ||
| # but that's not the case. | ||
| test -f $dst/.profile && . $dst/.profile | ||
|
|
||
| # | ||
| # Create grub.cfg | ||
| # | ||
| cat >$dst/boot/grub2/grub.cfg <<XXX | ||
| # kiwi generated one time grub2 config file | ||
| set btrfs_relative_path="y" | ||
| export btrfs_relative_path | ||
| search --file --set=root /boot/0x11cebed2 | ||
| set default=0 | ||
| if [ -n "\$extra_cmdline" ]; then | ||
| submenu "Bootable snapshot \$snapshot_num" { | ||
| menuentry "If OK, run snapper rollback and reboot." { true; } | ||
| } | ||
| fi | ||
| if [ -n "\${iso_path}" ]; then | ||
| isoboot="iso-scan/filename=\${iso_path}" | ||
| fi | ||
| set timeout=10 | ||
| set timeout_style=menu | ||
| if [ "\${grub_platform}" = "efi" ]; then | ||
| echo "Please press 't' to show the boot menu on this console" | ||
| fi | ||
| set gfxmode=auto | ||
| set font=(\$root)/boot/aarch64/loader/grub2/fonts/unicode.pf2 | ||
| set ascii_font=grub2/themes/openSUSE/ascii.pf2 | ||
| set sans_bold_14_font=grub2/themes/openSUSE/DejaVuSans-Bold14.pf2 | ||
| set sans_10_font=grub2/themes/openSUSE/DejaVuSans10.pf2 | ||
| set sans_12_font=grub2/themes/openSUSE/DejaVuSans12.pf2 | ||
| if [ -f \${font} ];then | ||
| loadfont \${font} | ||
| fi | ||
| if [ -f (\$root)/boot/\${ascii_font} ];then | ||
| loadfont (\$root)/boot/\${ascii_font} | ||
| fi | ||
| if [ -f (\$root)/boot/\${sans_bold_14_font} ];then | ||
| loadfont (\$root)/boot/\${sans_bold_14_font} | ||
| fi | ||
| if [ -f (\$root)/boot/\${sans_10_font} ];then | ||
| loadfont (\$root)/boot/\${sans_10_font} | ||
| fi | ||
| if [ -f (\$root)/boot/\${sans_12_font} ];then | ||
| loadfont (\$root)/boot/\${sans_12_font} | ||
| fi | ||
| if [ -f (\$root)/boot/grub2/themes/openSUSE/theme.txt ];then | ||
| set theme=(\$root)/boot/grub2/themes/openSUSE/theme.txt | ||
| fi | ||
| terminal_input console | ||
| terminal_output gfxterm | ||
| menuentry "$kiwi_iname" --class os --unrestricted { | ||
| set gfxpayload=keep | ||
| echo Loading kernel... | ||
| linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} | ||
| echo Loading initrd... | ||
| initrd (\$root)/boot/aarch64/loader/initrd | ||
| } | ||
| menuentry "Failsafe -- $kiwi_iname" --class os --unrestricted { | ||
| set gfxpayload=keep | ||
| echo Loading kernel... | ||
| linux (\$root)/boot/aarch64/loader/linux \${extra_cmdline} \${isoboot} ide=nodma apm=off noresume edd=off nomodeset 3 | ||
| echo Loading initrd... | ||
| initrd (\$root)/boot/aarch64/loader/initrd | ||
| } | ||
| menuentry "Mediacheck" --class os --unrestricted { | ||
| set gfxpayload=keep | ||
| echo Loading kernel... | ||
| linux (\$root)/boot/aarch64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot} | ||
| echo Loading initrd... | ||
| initrd (\$root)/boot/aarch64/loader/initrd | ||
| } | ||
| menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os { | ||
| exit | ||
| } | ||
| if [ -f "/.snapshots/grub-snapshot.cfg" ]; then | ||
| source "/.snapshots/grub-snapshot.cfg" | ||
| fi | ||
| if [ "\${grub_platform}" = "efi" ]; then | ||
| hiddenentry "Text mode" --hotkey "t" { | ||
| set textmode=true | ||
| terminal_output console | ||
| } | ||
| fi | ||
| XXX | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,110 @@ | ||
| #! /bin/bash | ||
|
|
||
| # Custom menu to ensure that we boot correctly | ||
| # from local disk on UEFI | ||
| # https://github.com/openSUSE/agama/issues/1609 | ||
| # KIWI config | ||
|
|
||
| dst="$1" | ||
|
|
||
| if [ ! -d "$dst" ] ; then | ||
| echo "fix_bootconfig.x86_64: image dir \"$dst\" not found" | ||
| exit 1 | ||
| fi | ||
|
|
||
| # KIWI config which should normally be inherited | ||
| # from a parent process in our case xorriso | ||
| # but that's not the case. | ||
| test -f $dst/.profile && . $dst/.profile | ||
|
|
||
| # | ||
| # Create grub.cfg | ||
| # | ||
| cat >$dst/boot/grub2/grub.cfg <<XXX | ||
| # kiwi generated one time grub2 config file | ||
| set btrfs_relative_path="y" | ||
| export btrfs_relative_path | ||
| search --file --set=root /boot/0xebe87947 | ||
| set default=0 | ||
| if [ -n "\$extra_cmdline" ]; then | ||
| submenu "Bootable snapshot \$snapshot_num" { | ||
| menuentry "If OK, run snapper rollback and reboot." { true; } | ||
| } | ||
| fi | ||
| if [ -n "\${iso_path}" ]; then | ||
| isoboot="iso-scan/filename=\${iso_path}" | ||
| fi | ||
| set timeout=10 | ||
| set timeout_style=menu | ||
| if [ "\${grub_platform}" = "efi" ]; then | ||
| echo "Please press 't' to show the boot menu on this console" | ||
| fi | ||
| set gfxmode=auto | ||
| set font=(\$root)/boot/x86_64/loader/grub2/fonts/unicode.pf2 | ||
| set ascii_font=grub2/themes/openSUSE/ascii.pf2 | ||
| set sans_bold_14_font=grub2/themes/openSUSE/DejaVuSans-Bold14.pf2 | ||
| set sans_10_font=grub2/themes/openSUSE/DejaVuSans10.pf2 | ||
| set sans_12_font=grub2/themes/openSUSE/DejaVuSans12.pf2 | ||
| if [ -f \${font} ];then | ||
| loadfont \${font} | ||
| fi | ||
| if [ -f (\$root)/boot/\${ascii_font} ];then | ||
| loadfont (\$root)/boot/\${ascii_font} | ||
| fi | ||
| if [ -f (\$root)/boot/\${sans_bold_14_font} ];then | ||
| loadfont (\$root)/boot/\${sans_bold_14_font} | ||
| fi | ||
| if [ -f (\$root)/boot/\${sans_10_font} ];then | ||
| loadfont (\$root)/boot/\${sans_10_font} | ||
| fi | ||
| if [ -f (\$root)/boot/\${sans_12_font} ];then | ||
| loadfont (\$root)/boot/\${sans_12_font} | ||
| fi | ||
| if [ -f (\$root)/boot/grub2/themes/openSUSE/theme.txt ];then | ||
| set theme=(\$root)/boot/grub2/themes/openSUSE/theme.txt | ||
| fi | ||
| terminal_input console | ||
| terminal_output gfxterm | ||
| menuentry "$kiwi_iname" --class os --unrestricted { | ||
| set gfxpayload=keep | ||
| echo Loading kernel... | ||
| linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} | ||
| echo Loading initrd... | ||
| initrd (\$root)/boot/x86_64/loader/initrd | ||
| } | ||
| menuentry "Failsafe -- $kiwi_iname" --class os --unrestricted { | ||
| set gfxpayload=keep | ||
| echo Loading kernel... | ||
| linux (\$root)/boot/x86_64/loader/linux \${extra_cmdline} \${isoboot} ide=nodma apm=off noresume edd=off nomodeset 3 | ||
| echo Loading initrd... | ||
| initrd (\$root)/boot/x86_64/loader/initrd | ||
| } | ||
| menuentry "Mediacheck" --class os --unrestricted { | ||
| set gfxpayload=keep | ||
| echo Loading kernel... | ||
| linux (\$root)/boot/x86_64/loader/linux mediacheck=1 plymouth.enable=0 \${isoboot} | ||
| echo Loading initrd... | ||
| initrd (\$root)/boot/x86_64/loader/initrd | ||
| } | ||
| menuentry "Boot from Hard Disk" --class opensuse --class gnu-linux --class gnu --class os { | ||
| if search --no-floppy --file /efi/boot/fallback.efi --set ; then | ||
| for os in opensuse sles leap; do | ||
|
There was a problem hiding this comment. Seems like somebody exchanged opensuse for leap in the past ... so now Agama:Devel/agama-installer has leap too :-)
|
||
| if [ -f /efi/\$os/grub.efi ] ; then | ||
| chainloader /efi/\$os/grub.efi | ||
| boot | ||
| fi | ||
| done | ||
| fi | ||
| exit | ||
| } | ||
| if [ -f "/.snapshots/grub-snapshot.cfg" ]; then | ||
| source "/.snapshots/grub-snapshot.cfg" | ||
| fi | ||
| if [ "\${grub_platform}" = "efi" ]; then | ||
| hiddenentry "Text mode" --hotkey "t" { | ||
| set textmode=true | ||
| terminal_output console | ||
| } | ||
| fi | ||
| XXX | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,19 @@ | ||
| ------------------------------------------------------------------- | ||
| Mon Sep 16 15:46:23 UTC 2024 - Lubos Kocman <[email protected]> | ||
|
|
||
| - Define boot menu for all arches by scripts in config-cdroot | ||
| newly added x86_64 and aarch64 write stock copies from kiwi | ||
| generated grub.cfg | ||
|
|
||
| - intel uefi boot fix from "Boot from disk item" (gh#openSUSE/agama#1609) | ||
|
|
||
| - Keep -x on purpose for future trubleshooting (advice from Marcus) | ||
|
|
||
| - Use $kiwi_iname instead of static agama-live reference in all of | ||
| config-cdroom/* with exception of s390x, where for some reason | ||
| we use SUSE Linux... string instead | ||
|
|
||
|
|
||
| ------------------------------------------------------------------- | ||
| Mon Sep 9 15:55:16 UTC 2024 - Eugenio Paolantonio <[email protected]> | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
do you test if that exit works properly on arm? does it move to the next entry in boot menu?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hello Josef, this was a copypaste from the Arm agama-installer without any modifications.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
but nope we currently only test on intel in openQA and I have no arm device at hand.