diff options
| -rwxr-xr-x | Fedora-efi-grub2.sh | 10 | ||||
| -rwxr-xr-x | scripts/tar-to-image.sh | 6 |
2 files changed, 12 insertions, 4 deletions
diff --git a/Fedora-efi-grub2.sh b/Fedora-efi-grub2.sh index 0a61955..e27e009 100755 --- a/Fedora-efi-grub2.sh +++ b/Fedora-efi-grub2.sh @@ -3,7 +3,13 @@ vers="${1-29}" name="fedora-${vers}-efi-grub2" repo="repos/fedora-${vers}-$(sh basearch.sh).repo" -rpms="grub2-efi shim efibootmgr -dracut-config-rescue dracut-config-generic" +rpms="grub2-efi efibootmgr -dracut-config-rescue dracut-config-generic" + +rpms_i686="" +rpms_x86_64="shim" +rpms_armhfp="" +rpms_aarch64="shim" +eval "rpms=\"\$rpms \$rpms_$(uname -m)\"" arch="$(uname -m)" tar="${IMAGEFISH_DESTDIR-.}/${name}-${arch}.tar.gz" @@ -13,6 +19,8 @@ echo "" echo "###" echo "### $name" echo "###" +echo "### $rpms" +echo "###" set -ex rm -f "$tar" "$img" diff --git a/scripts/tar-to-image.sh b/scripts/tar-to-image.sh index 7924b4c..0ad2532 100755 --- a/scripts/tar-to-image.sh +++ b/scripts/tar-to-image.sh @@ -274,11 +274,11 @@ EOF fi haveboot=$(guestfish --remote -- is-file /boot/efi/EFI/BOOT/${uefi_boot_file}) - if test "$havegrubby" = "true"; then - echo "# have ${uefi_boot_file}, good" + if test "$haveboot" = "true"; then + echo "### have ${uefi_boot_file}, good" else grubefi=$(guestfish --remote -- ls /boot/efi/EFI/*/grub*.efi) - echo "# install ${grubefi} as ${uefi_boot_file}" + echo "### install ${grubefi} as ${uefi_boot_file}" fish cp ${grubefi} /boot/efi/EFI/BOOT/${uefi_boot_file} fi } |