mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
small fixes
This commit is contained in:
parent
3d810db1a4
commit
4101bf39d5
1 changed files with 1 additions and 3 deletions
|
@ -189,7 +189,7 @@ _do_uefi_secure_boot_efitools() {
|
||||||
if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then
|
if [[ -n "${_UEFI_SECURE_BOOT}" ]]; then
|
||||||
[[ -d "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
|
[[ -d "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
|
||||||
if [[ ! -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/HashTool.efi" ]]; then
|
if [[ ! -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/HashTool.efi" ]]; then
|
||||||
cp "${_DESTDIR}/usr/share/efitools/efi/HashTool.efi" "${_DESTDIR}/{_UEFISYS_MP}/EFI/BOOT/HashTool.efi"
|
cp "${_DESTDIR}/usr/share/efitools/efi/HashTool.efi" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/HashTool.efi"
|
||||||
_BOOTMGR_LABEL="HashTool (Secure Boot)"
|
_BOOTMGR_LABEL="HashTool (Secure Boot)"
|
||||||
_BOOTMGR_LOADER_PATH="/EFI/BOOT/HashTool.efi"
|
_BOOTMGR_LOADER_PATH="/EFI/BOOT/HashTool.efi"
|
||||||
_do_uefi_bootmgr_setup
|
_do_uefi_bootmgr_setup
|
||||||
|
@ -912,8 +912,6 @@ _do_grub_uefi() {
|
||||||
sleep 5
|
sleep 5
|
||||||
${_NSPAWN} grub-mkstandalone -d /usr/lib/grub/"${_GRUB_ARCH}"-efi -O "${_GRUB_ARCH}"-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video boot btrfs cat configfile cryptodisk echo efi_gop efi_uga efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard" --fonts="ter-u16n" --locales="en@quot" --themes="" -o "${_GRUB_PREFIX_DIR}/grub${_SPEC_UEFI_ARCH}.efi" "boot/grub/grub.cfg=/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}"
|
${_NSPAWN} grub-mkstandalone -d /usr/lib/grub/"${_GRUB_ARCH}"-efi -O "${_GRUB_ARCH}"-efi --sbat=/usr/share/grub/sbat.csv --modules="all_video boot btrfs cat configfile cryptodisk echo efi_gop efi_uga efifwsetup efinet ext2 f2fs fat font gcry_rijndael gcry_rsa gcry_serpent gcry_sha256 gcry_twofish gcry_whirlpool gfxmenu gfxterm gzio halt hfsplus http iso9660 loadenv loopback linux lvm lsefi lsefimmap luks luks2 mdraid09 mdraid1x minicmd net normal part_apple part_msdos part_gpt password_pbkdf2 pgp png reboot regexp search search_fs_uuid search_fs_file search_label serial sleep syslinuxcfg test tftp video xfs zstd backtrace chain tpm usb usbserial_common usbserial_pl2303 usbserial_ftdi usbserial_usbdebug keylayouts at_keyboard" --fonts="ter-u16n" --locales="en@quot" --themes="" -o "${_GRUB_PREFIX_DIR}/grub${_SPEC_UEFI_ARCH}.efi" "boot/grub/grub.cfg=/${_GRUB_PREFIX_DIR}/${_GRUB_CFG}"
|
||||||
fi
|
fi
|
||||||
[[ -d "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
|
|
||||||
cp "${_DESTDIR}/"${_GRUB_PREFIX_DIR}"/"${_GRUB_CFG}" "${_DESTDIR}/"${_UEFISYS_MP}"/EFI/BOOT/grub"${_SPEC_UEFI_ARCH}".cfg
|
|
||||||
fi
|
fi
|
||||||
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/grub/grub${_SPEC_UEFI_ARCH}.efi" && -z "${_UEFI_SECURE_BOOT}" && -e "${_DESTDIR}/boot/grub/${_GRUB_ARCH}-efi/core.efi" ]]; then
|
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/grub/grub${_SPEC_UEFI_ARCH}.efi" && -z "${_UEFI_SECURE_BOOT}" && -e "${_DESTDIR}/boot/grub/${_GRUB_ARCH}-efi/core.efi" ]]; then
|
||||||
_BOOTMGR_LABEL="GRUB"
|
_BOOTMGR_LABEL="GRUB"
|
||||||
|
|
Loading…
Reference in a new issue