diff options
| author | David P <megver83@parabola.nu> | 2022-05-29 23:14:16 -0400 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2022-05-29 23:14:16 -0400 |
| commit | 8f2804cf0dbf5243b55d2943e1036ed0a95b6ec1 (patch) | |
| tree | 0cefa7c21533174b8ec14263c6250f753e3498d9 | |
| parent | 2ac8096ba06c44be152b8112b45f9e263458757c (diff) | |
fix refind validation
Signed-off-by: David P <megver83@parabola.nu>
| -rwxr-xr-x | parabolaiso/mkparabolaiso | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso index 6acc53e..6af74b7 100755 --- a/parabolaiso/mkparabolaiso +++ b/parabolaiso/mkparabolaiso @@ -563,8 +563,8 @@ _make_bootmode_uefi-ia32.grub.esp() { "${pacstrap_dir}/usr/share/edk2-shell/ia32/Shell_Full.efi") if [[ ! " ${bootmodes[*]} " =~ uefi-x64.systemd-boot.esp ]]; then - efiboot_files+=("${pacstrap_dir}/boot/vmlinuz-"* - "${pacstrap_dir}/boot/initramfs-"*".img") + efiboot_files+=("${pacstrap_dir}/boot/vmlinuz-"* + "${pacstrap_dir}/boot/initramfs-"*".img") efiboot_imgsize="$(du -bc "${efiboot_files[@]}" \ 2>/dev/null | awk 'END { print $1 }')" @@ -889,21 +889,21 @@ _validate_requirements_bootmode_uefi-ia32.grub.eltorito() { _validate_requirements_bootmode_uefi-x64.refind.esp() { _validate_common_requirements_bootmode_uefi-x64 # Check if rEFInd configuration files exist - if [[ ! -d "${profile}/efiboot/EFI/BOOT/entries" ]]; then + if [[ ! -d "${profile}/efiboot/entries" ]]; then (( validation_error=validation_error+1 )) - _msg_error "Validating '${bootmode}': The '${profile}/efiboot/EFI/BOOT/entries' directory is missing!" 0 + _msg_error "Validating '${bootmode}': The '${profile}/efiboot/entries' directory is missing!" 0 else - if [[ ! -e "${profile}/efiboot/EFI/BOOT/refind.conf" ]]; then + if [[ ! -e "${profile}/efiboot/refind.conf" ]]; then (( validation_error=validation_error+1 )) - _msg_error "Validating '${bootmode}': File '${profile}/efiboot/EFI/BOOT/refind.conf' not found!" 0 + _msg_error "Validating '${bootmode}': File '${profile}/efiboot/refind.conf' not found!" 0 fi local conffile - for conffile in "${profile}/efiboot/EFI/BOOT/entries/"*'.conf'; do + for conffile in "${profile}/efiboot/entries/"*'.conf'; do if [[ -e "${conffile}" ]]; then break else (( validation_error=validation_error+1 )) - _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/efiboot/EFI/BOOT/entries/'!" 0 + _msg_error "Validating '${bootmode}': No configuration file found in '${profile}/efiboot/entries/'!" 0 fi done fi |