rocky-linux/rocky-tools
4
0
Fork 0
mirror of https://github.com/rocky-linux/rocky-tools.git synced 2024-11-22 13:11:26 +00:00
Code Issues Projects Releases Activity

Merge pull request #19 from electroniceel/fix-uefi

Browse Source 
Fix migrate2rocky on EFI systems
This commit is contained in:
Neil Hanlon 2021-05-30 21:31:50 -04:00 committed by GitHub
commit 385270b537
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
migrate2rocky.sh
View File

@ -382,7 +382,6 @@ usage() {
"Usage: ${0##*/} [OPTIONS]" \ "Usage: ${0##*/} [OPTIONS]" \
'' \ '' \
'Options:' \ 'Options:' \
'-e Update EFI boot sector when done' \
'-h Display this help' \ '-h Display this help' \
'-r Convert to rocky' \ '-r Convert to rocky' \
'-V Verify switch' \ '-V Verify switch' \
@ -517,11 +516,26 @@ EOF
dnf -y distro-sync || exit_message "Error during distro-sync." dnf -y distro-sync || exit_message "Error during distro-sync."
} }
# Check if this system is running on EFI
# If yes, we'll need to run fix_efi() at the end of the conversion
efi_check () {
# Check if we have /sys mounted and it is looking sane
if ! [[ -d /sys/class/block ]]; then
exit_message "/sys is not accessible."
fi
# Now that we know /sys is reliable, use it to check if we are running on EFI or not
if [[ -d /sys/firmware/efi/ ]]; then
declare -g update_efi
update_efi=true
fi
}
# Called to update the EFI boot. # Called to update the EFI boot.
fix_efi () ( fix_efi () (
grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg || grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg ||
exit_message "Error updating the grub config." exit_message "Error updating the grub config."
efibootmgr -c -d "$efi_mount" -L "Rocky Linux" -I /EFI/rocky/grubx64.efi || efibootmgr -c -d "$efi_mount" -L "Rocky Linux" -l /EFI/rocky/grubx64.efi ||
exit_message "Error updating uEFI firmware." exit_message "Error updating uEFI firmware."
) )
@ -540,9 +554,6 @@ while getopts "hrVR" option; do
V) V)
verify_all_rpms=true verify_all_rpms=true
;; ;;
e)
update_efi=true
;;
*) *)
printf '%s\n' "${errcolor}Invalid switch.$nocolor" printf '%s\n' "${errcolor}Invalid switch.$nocolor"
usage usage
@ -553,6 +564,7 @@ if (( ! noopts )); then
usage usage
fi fi
efi_check
bin_check bin_check
if [[ $verify_all_rpms ]]; then if [[ $verify_all_rpms ]]; then