From c75f5c81b3b4a66c4c6b78397cd4cef42ce2374d Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Fri, 27 Jan 2023 17:55:17 +0100 Subject: [PATCH] armbian-next: ext: `grub-sbc-media`: syncs with original version, fixes, nextify --- extensions/grub-sbc-media.sh | 86 ++++++++++++++++++++++++++---------- 1 file changed, 63 insertions(+), 23 deletions(-) diff --git a/extensions/grub-sbc-media.sh b/extensions/grub-sbc-media.sh index 51c80122c..d1179bbc5 100644 --- a/extensions/grub-sbc-media.sh +++ b/extensions/grub-sbc-media.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash # This runs *after* user_config. Don't change anything not coming from other variables or meant to be configured by the user. - function extension_prepare_config__prepare_grub-sbc-media() { +function extension_prepare_config__prepare_grub-sbc-media() { display_alert "Prepare config" "${EXTENSION}" "info" # Extension configuration defaults. - export DISTRO_GENERIC_KERNEL=${DISTRO_GENERIC_KERNEL:-no} # if yes, does not build our own kernel, instead, uses generic one from distro - export UEFI_GRUB_DISABLE_OS_PROBER="${UEFI_GRUB_DISABLE_OS_PROBER:-}" # 'true' will disable os-probing, useful for SD cards. - export UEFI_GRUB_DISTRO_NAME="${UEFI_GRUB_DISTRO_NAME:-Armbian}" # Will be used on grub menu display - export UEFI_GRUB_TIMEOUT=${UEFI_GRUB_TIMEOUT:-3} # Small timeout by default + export DISTRO_GENERIC_KERNEL=${DISTRO_GENERIC_KERNEL:-no} # if yes, does not build our own kernel, instead, uses generic one from distro + export UEFI_GRUB_DISABLE_OS_PROBER="${UEFI_GRUB_DISABLE_OS_PROBER:-}" # 'true' will disable os-probing, useful for SD cards. + export UEFI_GRUB_DISTRO_NAME="${UEFI_GRUB_DISTRO_NAME:-Armbian}" # Will be used on grub menu display + export UEFI_GRUB_TIMEOUT=${UEFI_GRUB_TIMEOUT:-3} # Small timeout by default export UEFI_GRUB_RECORDFAIL_TIMEOUT=${UEFI_GRUB_RECORDFAIL_TIMEOUT:-3} - export GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT:-}" # Cmdline by default - export UEFI_ENABLE_BIOS_AMD64="${UEFI_ENABLE_BIOS_AMD64:-no}" # Enable BIOS too if target is amd64 + export GRUB_CMDLINE_LINUX_DEFAULT="${GRUB_CMDLINE_LINUX_DEFAULT:-}" # Cmdline by default + export UEFI_ENABLE_BIOS_AMD64="${UEFI_ENABLE_BIOS_AMD64:-no}" # Enable BIOS too if target is amd64 # User config overrides. export IMAGE_PARTITION_TABLE="gpt" # GPT partition table is essential for many UEFI-like implementations, eg Apple+Intel stuff. export UEFISIZE=256 # in MiB - grub EFI is tiny - but some EFI BIOSes ignore small too small EFI partitions @@ -17,7 +17,7 @@ export CLOUD_INIT_CONFIG_LOCATION="${CLOUD_INIT_CONFIG_LOCATION:-/boot/efi}" # use /boot/efi for cloud-init as default when using Grub. export EXTRA_BSP_NAME="${EXTRA_BSP_NAME}-grub" # Unique bsp name. export UEFI_GRUB_TARGET_BIOS="" # Target for BIOS GRUB install, set to i386-pc when UEFI_ENABLE_BIOS_AMD64=yes and target is amd64 - local uefi_packages="efibootmgr efivar" # Use growroot, add some efi-related packages + local uefi_packages="efibootmgr efivar" # Use growroot, add some efi-related packages uefi_packages="os-prober grub-efi-${ARCH}-bin ${uefi_packages}" # This works for Ubuntu and Debian, by sheer luck; common for EFI and BIOS [[ "${ARCH}" == "arm64" ]] && export uefi_packages="${uefi_packages} grub-efi-${ARCH}" @@ -26,7 +26,9 @@ DISTRO_KERNEL_PACKAGES="" DISTRO_FIRMWARE_PACKAGES="" - export PACKAGE_LIST_BOARD="${PACKAGE_LIST_BOARD} ${DISTRO_FIRMWARE_PACKAGES} ${DISTRO_KERNEL_PACKAGES} ${uefi_packages}" + # @TODO: use actual arrays. Yeah... + # shellcheck disable=SC2086 + add_packages_to_image ${DISTRO_FIRMWARE_PACKAGES} ${DISTRO_KERNEL_PACKAGES} ${uefi_packages} } @@ -35,10 +37,12 @@ pre_umount_final_image__install_grub() { local chroot_target=$MOUNT display_alert "Installing bootloader" "GRUB" "info" - # getting rid of the dtb package, if installed, is hard. for now just zap it, otherwise update-grub goes bananas - mkdir -p "$MOUNT"/boot/efi/dtb - cp -r "$MOUNT"/boot/dtb/* "$MOUNT"/boot/efi/dtb/ - cp -r ${SRC}/packages/blobs/splash/grub.png "$MOUNT"/boot/grub + # SBC-MEDIA: copy the dtbs to ESP + display_alert "Copying DTBs to ESP" "${EXTENSION}" "info" + run_host_command_logged mkdir -pv "$MOUNT"/boot/efi/dtb + run_host_command_logged cp -vr "$MOUNT"/boot/dtb/* "$MOUNT"/boot/efi/dtb/ + display_alert "Copying Splash to ESP" "${EXTENSION}" "info" + run_host_command_logged cp -rv ${SRC}/packages/blobs/splash/grub.png "$MOUNT"/boot/grub # add config to disable os-prober, otherwise image will have the host's other OSes boot entries. cat <<- grubCfgFragHostSide >> "${MOUNT}"/etc/default/grub.d/99-armbian-host-side.cfg @@ -46,31 +50,67 @@ pre_umount_final_image__install_grub() { grubCfgFragHostSide # copy Armbian GRUB wallpaper - mkdir -p "${MOUNT}"/usr/share/images/grub/ - cp "${SRC}"/packages/blobs/splash/grub.png "${MOUNT}"/usr/share/images/grub/wallpaper.png + run_host_command_logged mkdir -pv "${chroot_target}"/usr/share/images/grub/ + run_host_command_logged cp -v "${SRC}"/packages/blobs/splash/grub.png "${chroot_target}"/usr/share/images/grub/wallpaper.png # Mount the chroot... mount_chroot "$chroot_target/" # this already handles /boot/efi which is required for it to work. - sed -i '/devicetree/c echo' "$MOUNT"/etc/grub.d/10_linux >>"${DEST}"/"${LOG_SUBPATH}"/grub-n.log 2>&1 + # SBC-MEDIA specific... + sed -i '/devicetree/c echo' "$MOUNT"/etc/grub.d/10_linux - local install_grub_cmdline="update-grub && grub-install --verbose --target=${UEFI_GRUB_TARGET} --no-nvram --removable" # nvram is global to the host, even across chroot. take care. - display_alert "Installing GRUB EFI..." "${UEFI_GRUB_TARGET}" "" - chroot "$chroot_target" /bin/bash -c "$install_grub_cmdline" >> "$DEST"/"${LOG_SUBPATH}"/install.log 2>&1 || { + # update-grub is secretly `grub-mkconfig` under wraps, but the actual work is done by /etc/grub.d/10-linux + # that decides based on 'test -e "/dev/disk/by-uuid/${GRUB_DEVICE_UUID}"' so that _must_ exist. + # If it does NOT exist, then a reference to a /dev/devYpX is used, and will fail to boot. + # Irony: let's use grub-probe to find out the UUID of the root partition, and then create a symlink to it. + # Another: on some systems (eg, not Docker) the thing might already exist due to udev actually working. + # shellcheck disable=SC2016 # some wierd escaping going on there. + chroot_custom "$chroot_target" mkdir -pv '/dev/disk/by-uuid/"$(grub-probe --target=fs_uuid /)"' "||" true + + display_alert "Creating GRUB config..." "${EXTENSION}: grub-mkconfig / update-grub" + chroot_custom "$chroot_target" update-grub || { + exit_with_error "update-grub failed!" + } + + local install_grub_cmdline="grub-install --target=${UEFI_GRUB_TARGET} --no-nvram --removable" # nvram is global to the host, even across chroot. take care. + display_alert "Installing GRUB EFI..." "${EXTENSION}: ${UEFI_GRUB_TARGET}" + chroot_custom "$chroot_target" "$install_grub_cmdline" || { exit_with_error "${install_grub_cmdline} failed!" } + ### Sanity check. The produced "/boot/grub/grub.cfg" should: + declare -i has_failed_sanity_check=0 + + # - NOT have any mention of `/dev` inside; otherwise something is going to fail + if grep -q '/dev' "${chroot_target}/boot/grub/grub.cfg"; then + display_alert "GRUB sanity check failed" "grub.cfg contains /dev" "err" + SHOW_LOG=yes run_host_command_logged grep '/dev' "${chroot_target}/boot/grub/grub.cfg" "||" true + has_failed_sanity_check=1 + else + display_alert "GRUB config sanity check passed" "no '/dev' found in grub.cfg" "info" + fi + + # - HAVE references to initrd, otherwise going to fail. + if ! grep -q 'initrd.img' "${chroot_target}/boot/grub/grub.cfg"; then + display_alert "GRUB config sanity check failed" "no initrd.img references found in /boot/grub/grub.cfg" "err" + has_failed_sanity_check=1 + else + display_alert "GRUB config sanity check passed" "initrd.img references found OK in /boot/grub/grub.cfg" "debug" + fi + + if [[ ${has_failed_sanity_check} -gt 0 ]]; then + exit_with_error "GRUB config sanity check failed, image will be unbootable; see above errors" + fi + # Remove host-side config. rm -f "${MOUNT}"/etc/default/grub.d/99-armbian-host-side.cfg - local root_uuid - root_uuid=$(blkid -s UUID -o value "${LOOP}p${uefipart}") # get the uuid of the root partition, this has been transposed - if [[ $BOARD == jetson-nano ]]; then - cp -R $SRC/packages/blobs/jetson/boot.scr "${MOUNT}"/boot/efi/boot.scr + run_host_command_logged cp -v "${SRC}/packages/blobs/jetson/boot.scr" "${MOUNT}"/boot/efi/boot.scr fi umount_chroot "$chroot_target/" + } configure_grub() {