diff --git a/installer b/installer index 4c57877..7510bef 100755 --- a/installer +++ b/installer @@ -6,7 +6,7 @@ # AIF, Calamares, and the Arch Wiki.. Credit where credit is due # shellcheck disable=SC2086,SC2046,SC2254,SC2164 -VER=2.5 +VER=2.6 # default values { @@ -772,7 +772,7 @@ select_bootldr() dlg BOOTLDR menu "UEFI Bootloader" "\nSelect which bootloader to use." \ "systemd-boot" "A simple UEFI boot manager which executes configured EFI images" \ "grub" "The Grand Unified Bootloader, standard among many Linux distributions" \ - "refind-efi" "A UEFI boot manager that aims to be platform neutral and simplify multi-boot" \ + "refind" "A UEFI boot manager that aims to be platform neutral and simplify multi-boot" \ "efistub" "Boot the kernel image directly (no chainloading support)" \ "syslinux" "A collection of boot loaders for booting drives, CDs, or over the network (no chainloading support)" || return 1 fi @@ -1890,7 +1890,7 @@ install_bootldr() if [[ $ROOT == /dev/mapper* ]]; then ROOT_ID="$ROOT" else - [[ $BOOTLDR =~ (systemd-boot|refind-efi|efistub) ]] && uuid_type="PARTUUID" + [[ $BOOTLDR =~ (systemd-boot|refind|efistub) ]] && uuid_type="PARTUUID" ROOT_ID="$uuid_type=$(blkid -s $uuid_type -o value $ROOT)" fi @@ -1944,7 +1944,7 @@ install_bootldr() cp -rf "$MNT/boot/EFI/syslinux/"* "$MNT/boot/EFI/BOOT/" cp -f "$MNT/boot/EFI/syslinux/syslinux.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" ;; - refind-efi) + refind) k="linux-hardened,linux-zen,linux-lts,linux" sed -i "/#extra_kernel_version_strings/ c extra_kernel_version_strings $k" "$MNT/boot/EFI/refind/refind.conf" cp -fv "$MNT/boot/EFI/refind/refind_x64.efi" "$MNT/boot/EFI/BOOT/BOOTX64.EFI" @@ -2012,9 +2012,9 @@ install_packages() if [[ $BOOTLDR == 'grub' ]]; then chrun "pacman -S os-prober grub --needed --noconfirm" 2> "$ERR" 2>&1 errshow 1 "chrun 'pacman -S os-prober grub --needed --noconfirm'" - elif [[ $BOOTLDR == 'refind-efi' ]]; then - chrun "pacman -S refind-efi --needed --noconfirm" 2> "$ERR" 2>&1 - errshow 1 "chrun 'pacman -S refind-efi --needed --noconfirm'" + elif [[ $BOOTLDR == 'refind' ]]; then + chrun "pacman -S refind --needed --noconfirm" 2> "$ERR" 2>&1 + errshow 1 "chrun 'pacman -S refind --needed --noconfirm'" elif [[ $BOOTLDR == 'syslinux' ]]; then chrun "pacman -S syslinux --needed --noconfirm" 2> "$ERR" 2>&1 errshow 1 "chrun 'pacman -S syslinux --needed --noconfirm'" @@ -2433,13 +2433,13 @@ prerun_syslinux() return 0 } -setup_refind-efi() +setup_refind() { EDIT_FILES[bootloader]="/boot/refind_linux.conf" BCMDS[refind-efi]="mount -t efivarfs efivarfs /sys/firmware/efi/efivars > /dev/null 2>&1; refind-install" } -prerun_refind-efi() +prerun_refind() { cat > "$MNT/boot/refind_linux.conf" <<- EOF "$DIST Linux" "root=$ROOT_ID ${LUKS_DEV}${RESUME}rw$([[ $BTRFS_MNT ]] && printf ' %s' "$BTRFS_MNT") add_efi_memmap $([[ $UCODE ]] && @@ -2454,7 +2454,7 @@ prerun_refind-efi() [Trigger] Operation = Upgrade Type = Package - Target = refind-efi + Target = refind [Action] Description = Updating rEFInd on ESP