diff options
author | Lyndon Brown <jnqnfe@gmail.com> | 2020-02-10 15:48:49 +0000 |
---|---|---|
committer | Raphaƫl Hertzog <hertzog@debian.org> | 2020-03-05 11:29:01 +0000 |
commit | 36a3ba76347ef72df1c316312ed3a26aa4b0c816 (patch) | |
tree | 1777349053ca63a9cb543230289b2c1f65778a5c /scripts/build/binary_grub-efi | |
parent | a96107a3f124cdbeecb3fb6d4a13f3dc7cb62ea7 (diff) | |
download | vyos-live-build-36a3ba76347ef72df1c316312ed3a26aa4b0c816.tar.gz vyos-live-build-36a3ba76347ef72df1c316312ed3a26aa4b0c816.zip |
fix indentation
including:
- spaces replaced with tabs for consistency
- alignment of `;;` in some case statements changed for consistency
Gbp-Dch: Short
Closes: #952857
Diffstat (limited to 'scripts/build/binary_grub-efi')
-rwxr-xr-x | scripts/build/binary_grub-efi | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/scripts/build/binary_grub-efi b/scripts/build/binary_grub-efi index 7afa07eb7..057db6bd6 100755 --- a/scripts/build/binary_grub-efi +++ b/scripts/build/binary_grub-efi @@ -49,10 +49,10 @@ case "${LB_ARCHITECTURES}" in amd64|i386) Check_package chroot /usr/lib/grub/x86_64-efi/configfile.mod grub-efi-amd64-bin Check_package chroot /usr/lib/grub/i386-efi/configfile.mod grub-efi-ia32-bin - ;; + ;; arm64) Check_package chroot /usr/lib/grub/arm64-efi/configfile.mod grub-efi-arm64-bin - ;; + ;; esac Check_package chroot /usr/bin/grub-mkimage grub-common Check_package chroot /usr/bin/mcopy mtools @@ -66,12 +66,12 @@ case "${LB_ARCHITECTURES}" in _SB_EFI_PLATFORM="x86_64" _SB_EFI_NAME="x64" _SB_EFI_DEB="amd64" - ;; + ;; arm64) _SB_EFI_PLATFORM="arm64" _SB_EFI_NAME="aa64" _SB_EFI_DEB="arm64" - ;; + ;; esac _PRE_SB_PACKAGES="${_LB_PACKAGES}" @@ -94,7 +94,7 @@ case "${LB_UEFI_SECURE_BOOT}" in else Echo_message "UEFI Secure Boot support enabled." fi - ;; + ;; enable) Check_package chroot /usr/lib/grub/${_SB_EFI_PLATFORM}-efi-signed/gcd${_SB_EFI_NAME}.efi.signed \ grub-efi-${_SB_EFI_DEB}-signed @@ -102,10 +102,10 @@ case "${LB_UEFI_SECURE_BOOT}" in shim-signed Install_package Echo_message "UEFI Secure Boot support enabled." - ;; + ;; disable) Echo_message "UEFI Secure Boot support disabled." - ;; + ;; esac _LB_PACKAGES="${_PRE_SB_PACKAGES}" @@ -115,7 +115,7 @@ case "${LIVE_IMAGE_TYPE}" in Echo_warning "Bootloader in this image type not yet supported by live-build." Echo_warning "This would produce a not bootable image, aborting (FIXME)." exit 1 - ;; + ;; esac # Restoring cache @@ -129,7 +129,7 @@ rm -rf binary/boot/efi.img binary/boot/grub/i386-efi/ binary/boot/grub/x86_64-ef # This is workaround till both efi-image and grub-cpmodules are put into a binary package case "${LB_BUILD_WITH_CHROOT}" in - true) + true) if [ ! -e "${LIVE_BUILD}" ] ; then LIVE_BUILD_PATH="/usr/lib/live/build" else @@ -140,10 +140,11 @@ case "${LB_BUILD_WITH_CHROOT}" in cp "${LIVE_BUILD_PATH}/grub-cpmodules" "chroot/${LIVE_BUILD_PATH}" _CHROOT_DIR="" - ;; + ;; + false) _CHROOT_DIR="chroot" - ;; + ;; esac ##### cat >binary.sh <<END @@ -174,10 +175,10 @@ gen_efi_boot_img(){ # and grub-efi-amd64-signed, currently in Ubuntu: # https://packages.ubuntu.com/xenial/amd64/grub-efi-amd64-signed/filelist # https://packages.ubuntu.com/bionic/arm64/grub-efi-arm64-signed/filelist - # E.g., gcdx64.efi.signed is the boot loader for removable device, like CD or - # USB flash drive, while grubx64.efi.signed is for hard drive. - # Therefore here gcdx64.efi.signed is used for amd64 and gcdaa64.efi.signed is - # for arm64. + # E.g., gcdx64.efi.signed is the boot loader for removable device, like CD or + # USB flash drive, while grubx64.efi.signed is for hard drive. + # Therefore here gcdx64.efi.signed is used for amd64 and gcdaa64.efi.signed is + # for arm64. if [ -r ${_CHROOT_DIR}/usr/lib/grub/\$platform-signed/gcd\$efi_name.efi.signed -a \ -r ${_CHROOT_DIR}/usr/lib/shim/shim\$efi_name.efi.signed -a \ "${LB_UEFI_SECURE_BOOT}" != "disable" ]; then @@ -259,7 +260,7 @@ mcopy -o -i "${_CHROOT_DIR}/grub-efi-temp/boot/grub/efi.img" ${_CHROOT_DIR}/grub END case "${LB_BUILD_WITH_CHROOT}" in - true) + true) mv binary.sh chroot/ Chroot chroot "sh binary.sh" rm -f chroot/binary.sh |