mirror of
https://gitlab.com/prism7/archery.git
synced 2025-02-15 08:29:17 +01:00
Add: 'Automatic Partitioning' > 'Smart Partitioning' & 'Manual Presets': Now, when an Extended Bootloader Partition is needed the installer will create it without any user interaction
Change: Bootloader configuration (btldr_conf) function revised to comply with latest installer changes Add: Edited a few prompts for visual/aesthetic purposes
This commit is contained in:
elementrick
parent
076d59db95
commit
4ccce091b5
1 changed files with 121 additions and 99 deletions
168
Amelia.sh
168
Amelia.sh
|
|
@ -1,7 +1,7 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Amelia Installer
|
# Amelia Installer
|
||||||
# Version: 7.2
|
# Version: 7.4
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
|
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
|
||||||
|
|
@ -107,6 +107,12 @@ reload() {
|
||||||
|
|
||||||
--> [${green}Reloading${nc}] "
|
--> [${green}Reloading${nc}] "
|
||||||
}
|
}
|
||||||
|
process() {
|
||||||
|
sleep 0.2
|
||||||
|
NC "
|
||||||
|
|
||||||
|
--> [${green}Processing..${nc}] "
|
||||||
|
}
|
||||||
invalid() {
|
invalid() {
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
|
|
@ -489,11 +495,10 @@ ${magenta}###${nc}----------------------------------------${magenta}[ ${bwhite}M
|
||||||
YELLOW "
|
YELLOW "
|
||||||
|
|
||||||
> Make a selection: "
|
> Make a selection: "
|
||||||
RED "
|
CYAN "
|
||||||
|
|
||||||
---------------------------------------------------------------------
|
*** ${nc}Select ${bwhite}[4] ${nc}to utilize ${yellowl}'Guided Navigation' ${nc}& ${yellowl}'Smart Partitioning' ${nc}functions ${cyan}***
|
||||||
### ${yellow}Select ${bwhite}[4] ${nc}${yellow}for ${nc}'Guided Navigation' ${yellow}and ${nc}'Smart Partitioning' ${red}###
|
"
|
||||||
---------------------------------------------------------------------"
|
|
||||||
NC "
|
NC "
|
||||||
|
|
||||||
[1] Personalization
|
[1] Personalization
|
||||||
|
|
@ -1928,7 +1933,7 @@ ${magenta}###${nc}--------------------------------------${magenta}[ ${bwhite}Des
|
||||||
|
|
||||||
[11] Basic Arch Linux (No GUI)
|
[11] Basic Arch Linux (No GUI)
|
||||||
|
|
||||||
[12] Custom Arch Linux ${red}[!] EXPERTS ONLY [!] "
|
[12] Custom Arch Linux ${red}# EXPERTS ONLY # "
|
||||||
BLUE "
|
BLUE "
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -2430,7 +2435,9 @@ ${magenta}###${nc}------------------------------------${magenta}[ ${bwhite}Disk
|
||||||
> Select a disk to manage its GPT:
|
> Select a disk to manage its GPT:
|
||||||
|
|
||||||
|
|
||||||
### [Type ${nc}'?'${yellow} for help, ${nc}'x'${yellow} for extra functionality or ${nc}'q'${yellow} to quit]"
|
### Select disk and:
|
||||||
|
|
||||||
|
### Type ${nc}'?'${yellow} for help, ${nc}'x'${yellow} for extra functionality or ${nc}'q'${yellow} to quit "
|
||||||
NC "
|
NC "
|
||||||
|
|
||||||
${disks}"
|
${disks}"
|
||||||
|
|
@ -2604,6 +2611,7 @@ Enter a Preset number ${bwhite}(empty to skip)${blue}: "
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
auto_part() {
|
auto_part() {
|
||||||
|
|
||||||
|
slct_autoprt="yes"
|
||||||
local prompt="Disk Partitions"
|
local prompt="Disk Partitions"
|
||||||
local stage_prompt="Auto-Partitioning"
|
local stage_prompt="Auto-Partitioning"
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
|
|
@ -2634,6 +2642,7 @@ ${magenta}###${nc}---------------------------------${magenta}[ ${bwhite}Automati
|
||||||
elif [[ "${smartpart}" == "n" ]]; then
|
elif [[ "${smartpart}" == "n" ]]; then
|
||||||
sgdsk_nmbr="${instl_dsk_nmbr}"
|
sgdsk_nmbr="${instl_dsk_nmbr}"
|
||||||
use_manpreset="yes"
|
use_manpreset="yes"
|
||||||
|
process
|
||||||
until man_preset; do : ; done
|
until man_preset; do : ; done
|
||||||
else
|
else
|
||||||
y_n
|
y_n
|
||||||
|
|
@ -2691,6 +2700,7 @@ Enter a disk number ${bwhite}(empty to skip)${blue}: "
|
||||||
until man_preset; do : ; done
|
until man_preset; do : ; done
|
||||||
fi
|
fi
|
||||||
elif [[ -z "${preset}" ]] ; then
|
elif [[ -z "${preset}" ]] ; then
|
||||||
|
process
|
||||||
until manual_part; do : ; done
|
until manual_part; do : ; done
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
|
@ -2755,10 +2765,18 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
|
||||||
|
|
||||||
case "${preset}" in
|
case "${preset}" in
|
||||||
1)
|
1)
|
||||||
|
if [[ "${xbootloader}" == "yes" ]]; then
|
||||||
|
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n1:0:+200M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n2:0:+300M -t2:ea00 -c2:XBOOTLDR "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n3:0:0 -t3:8304 -c3:ROOT "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
else
|
||||||
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n2:0:0 -t2:8304 -c2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n2:0:0 -t2:8304 -c2:ROOT "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
fi
|
||||||
if [[ "${install}" == "yes" ]]; then
|
if [[ "${install}" == "yes" ]]; then
|
||||||
autopart="yes"
|
autopart="yes"
|
||||||
until sanity_check; do : ; done
|
until sanity_check; do : ; done
|
||||||
|
|
@ -2766,12 +2784,22 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
|
||||||
ok
|
ok
|
||||||
fi ;;
|
fi ;;
|
||||||
2)
|
2)
|
||||||
|
if [[ "${xbootloader}" == "yes" ]]; then
|
||||||
|
until set_swapsize; do : ; done
|
||||||
|
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n1:0:+200M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n2:0:+300M -t2:ea00 -c2:XBOOTLDR "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n3:0:+"${swapsize}"G -t3:8200 -c3:SWAP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n4:0:0 -t4:8304 -c4:ROOT "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
else
|
||||||
until set_swapsize; do : ; done
|
until set_swapsize; do : ; done
|
||||||
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n3:0:0 -t3:8304 -c3:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n3:0:0 -t3:8304 -c3:ROOT "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
fi
|
||||||
if [[ "${install}" == "yes" ]]; then
|
if [[ "${install}" == "yes" ]]; then
|
||||||
autopart="yes"
|
autopart="yes"
|
||||||
until sanity_check; do : ; done
|
until sanity_check; do : ; done
|
||||||
|
|
@ -2779,11 +2807,20 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
|
||||||
ok
|
ok
|
||||||
fi ;;
|
fi ;;
|
||||||
3)
|
3)
|
||||||
|
if [[ "${xbootloader}" == "yes" ]]; then
|
||||||
|
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n1:0:+200M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n2:0:+300M -t2:ea00 -c2:XBOOTLDR "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n3:0:+"${rootsize}"G -t3:8304 -c3:ROOT "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n4:0:0 -t4:8302 -c4:HOME "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
else
|
||||||
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n2:0:+"${rootsize}"G -t2:8304 -c2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n2:0:+"${rootsize}"G -t2:8304 -c2:ROOT "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n3:0:0 -t3:8302 -c3:Home "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n3:0:0 -t3:8302 -c3:HOME "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
fi
|
||||||
if [[ "${install}" == "yes" ]]; then
|
if [[ "${install}" == "yes" ]]; then
|
||||||
autopart="yes"
|
autopart="yes"
|
||||||
until sanity_check; do : ; done
|
until sanity_check; do : ; done
|
||||||
|
|
@ -2791,13 +2828,24 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
|
||||||
ok
|
ok
|
||||||
fi ;;
|
fi ;;
|
||||||
4)
|
4)
|
||||||
|
if [[ "${xbootloader}" == "yes" ]]; then
|
||||||
until set_swapsize; do : ; done
|
until set_swapsize; do : ; done
|
||||||
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n2:0:+300M -t2:ea00 -c2:XBOOTLDR "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n3:0:+"${rootsize}"G -t3:8304 -c3:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n3:0:+"${swapsize}"G -t3:8200 -c3:SWAP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
sgdisk -I -n4:0:0 -t4:8302 -c4:Home "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -I -n4:0:+"${rootsize}"G -t4:8304 -c4:ROOT "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n5:0:0 -t5:8302 -c5:HOME "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
else
|
||||||
|
until set_swapsize; do : ; done
|
||||||
|
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n1:0:+512M -t1:ef00 -c1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n2:0:+"${swapsize}"G -t2:8200 -c2:SWAP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n3:0:+"${rootsize}"G -t3:8304 -c3:ROOT "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
sgdisk -I -n4:0:0 -t4:8302 -c4:HOME "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
partprobe -s "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
||||||
|
fi
|
||||||
if [[ "${install}" == "yes" ]]; then
|
if [[ "${install}" == "yes" ]]; then
|
||||||
autopart="yes"
|
autopart="yes"
|
||||||
until sanity_check; do : ; done
|
until sanity_check; do : ; done
|
||||||
|
|
@ -2810,6 +2858,11 @@ Enter a Custom Percentage number ${nc}e.g. 30 ${bwhite}(empty to skip)${blue}: "
|
||||||
until disk_mngr; do : ; done
|
until disk_mngr; do : ; done
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
|
if [[ "${slct_autoprt}" == "yes" ]]; then
|
||||||
|
reload
|
||||||
|
until dsks_submn; do : ; done
|
||||||
|
return 0
|
||||||
|
fi
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
--------------------------------
|
--------------------------------
|
||||||
|
|
@ -3306,23 +3359,8 @@ ${multi_swap}
|
||||||
---------------------------------------------------"
|
---------------------------------------------------"
|
||||||
fi
|
fi
|
||||||
#..................................................................................................
|
#..................................................................................................
|
||||||
if [[ -e "${esp_dev}" ]]; then
|
if [[ "${bootloader}" == "1" && "${espmnt}" == "1" ]]; then
|
||||||
espsize="$(lsblk -dno SIZE --bytes "${esp_dev}")"
|
|
||||||
if [[ "${multibooting}" == "y" && "${bootloader}" == "1" && "${espmnt}" == "1" && "${espsize}" -lt "209715200" ]]; then
|
|
||||||
xbootloader="yes"
|
xbootloader="yes"
|
||||||
if [[ ! -e "${xboot_dev}" ]]; then
|
|
||||||
sleep 0.2
|
|
||||||
RED "
|
|
||||||
------------------------------------------------------
|
|
||||||
### ${yellow}A Linux Extended Boot Partition is mandatory ${red}###
|
|
||||||
------------------------------------------------------"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
xbootloader="no"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
if [[ ${xbootloader} == "yes" ]]; then
|
|
||||||
if [[ -e "${xboot_dev}" ]]; then
|
if [[ -e "${xboot_dev}" ]]; then
|
||||||
xbootprt="ok"
|
xbootprt="ok"
|
||||||
if [[ "${autoxboot}" == "y" ]]; then
|
if [[ "${autoxboot}" == "y" ]]; then
|
||||||
|
|
@ -3338,13 +3376,24 @@ ${multi_swap}
|
||||||
xbootprt="fail"
|
xbootprt="fail"
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
|
------------------------------------------------------
|
||||||
|
### ${yellow}A Linux Extended Boot Partition is mandatory ${red}###
|
||||||
|
------------------------------------------------------"
|
||||||
|
sleep 0.2
|
||||||
|
RED "
|
||||||
----------------------------------------------------
|
----------------------------------------------------
|
||||||
### ${yellow}Linux Extended Boot Partition not detected ${red}###
|
### ${yellow}Linux Extended Boot Partition not detected ${red}###
|
||||||
----------------------------------------------------"
|
----------------------------------------------------"
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
xbootloader="no"
|
||||||
fi
|
fi
|
||||||
#..................................................................................................
|
#..................................................................................................
|
||||||
|
|
||||||
|
if [[ -e "${esp_dev}" ]]; then
|
||||||
|
espsize="$(lsblk -dno SIZE --bytes "${esp_dev}")"
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ ! -e "${esp_dev}" ]]; then
|
if [[ ! -e "${esp_dev}" ]]; then
|
||||||
espprt="fail"
|
espprt="fail"
|
||||||
sleep 0.2
|
sleep 0.2
|
||||||
|
|
@ -3485,14 +3534,14 @@ ${multi_swap}
|
||||||
elif [[ "${partok}" == "n" ]]; then
|
elif [[ "${partok}" == "n" ]]; then
|
||||||
if [[ "${multibooting}" == "n" ]]; then
|
if [[ "${multibooting}" == "n" ]]; then
|
||||||
if [[ "${smartpart}" == "y" ]]; then
|
if [[ "${smartpart}" == "y" ]]; then
|
||||||
reload
|
process
|
||||||
until manual_part; do : ; done
|
until manual_part; do : ; done
|
||||||
else
|
else
|
||||||
reload
|
process
|
||||||
until auto_part; do : ; done
|
until auto_part; do : ; done
|
||||||
fi
|
fi
|
||||||
elif [[ "${multibooting}" == "y" ]]; then
|
elif [[ "${multibooting}" == "y" ]]; then
|
||||||
reload
|
process
|
||||||
until manual_part; do : ; done
|
until manual_part; do : ; done
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
|
@ -3563,14 +3612,14 @@ ${multi_swap}
|
||||||
fi
|
fi
|
||||||
elif [[ "${multibooting}" == "n" ]]; then
|
elif [[ "${multibooting}" == "n" ]]; then
|
||||||
if [[ "${smartpart}" == "n" && -z "${preset}" ]] ; then
|
if [[ "${smartpart}" == "n" && -z "${preset}" ]] ; then
|
||||||
reload
|
process
|
||||||
until manual_part; do : ; done
|
until manual_part; do : ; done
|
||||||
elif [[ "${smartpart}" == "n" && -n "${preset}" ]] ; then
|
elif [[ "${smartpart}" == "n" && -n "${preset}" ]] ; then
|
||||||
local stage_prompt="Partitioning"
|
local stage_prompt="Partitioning"
|
||||||
line2
|
line2
|
||||||
stage_fail
|
stage_fail
|
||||||
else
|
else
|
||||||
reload
|
process
|
||||||
until auto_part; do : ; done
|
until auto_part; do : ; done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
@ -5312,9 +5361,9 @@ btldr_conf() {
|
||||||
if [[ "${bootloader}" == "1" ]]; then
|
if [[ "${bootloader}" == "1" ]]; then
|
||||||
cnfg
|
cnfg
|
||||||
local stage_prompt="Systemd-boot"
|
local stage_prompt="Systemd-boot"
|
||||||
if [[ "${espmnt}" == "1" && "${xbootloader}" == "yes" ]]; then
|
if [[ "${espmnt}" == "1" ]]; then
|
||||||
if [[ "${uki}" == "n" ]]; then
|
if [[ "${uki}" == "n" ]]; then
|
||||||
if arch-chroot /mnt <<-XBOOTCTL_NOUKI > /dev/null 2>&1 ; then
|
if arch-chroot /mnt <<-XBOOTCTL > /dev/null 2>&1 ; then
|
||||||
bootctl --esp-path=/efi --boot-path=/boot install || exit
|
bootctl --esp-path=/efi --boot-path=/boot install || exit
|
||||||
echo "default arch.conf" > /boot/loader/loader.conf || exit
|
echo "default arch.conf" > /boot/loader/loader.conf || exit
|
||||||
cat <<-SDBOOT_CONF > /boot/loader/entries/arch.conf || exit
|
cat <<-SDBOOT_CONF > /boot/loader/entries/arch.conf || exit
|
||||||
|
|
@ -5324,51 +5373,24 @@ btldr_conf() {
|
||||||
options rw ${boot_opts}
|
options rw ${boot_opts}
|
||||||
SDBOOT_CONF
|
SDBOOT_CONF
|
||||||
systemctl enable systemd-boot-update || exit
|
systemctl enable systemd-boot-update || exit
|
||||||
XBOOTCTL_NOUKI
|
XBOOTCTL
|
||||||
stage_ok
|
stage_ok
|
||||||
else
|
else
|
||||||
stage_fail
|
stage_fail
|
||||||
fi
|
fi
|
||||||
elif [[ "${uki}" == "y" ]]; then
|
elif [[ "${uki}" == "y" ]]; then
|
||||||
if arch-chroot /mnt <<-XBOOTCTL_UKI > /dev/null 2>&1 ; then
|
if arch-chroot /mnt <<-XBOOTCTL > /dev/null 2>&1 ; then
|
||||||
bootctl --esp-path=/efi --boot-path=/boot install || exit
|
bootctl --esp-path=/efi --boot-path=/boot install || exit
|
||||||
systemctl enable systemd-boot-update || exit
|
systemctl enable systemd-boot-update || exit
|
||||||
XBOOTCTL_UKI
|
XBOOTCTL
|
||||||
stage_ok
|
stage_ok
|
||||||
else
|
else
|
||||||
stage_fail
|
stage_fail
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
elif [[ "${espmnt}" == "1" && "${xbootloader}" == "no" ]]; then
|
elif [[ "${espmnt}" == "2" ]]; then
|
||||||
if [[ "${uki}" == "n" ]]; then
|
if [[ "${uki}" == "n" ]]; then
|
||||||
if arch-chroot /mnt <<-BOOTCTL_NOUKI > /dev/null 2>&1 ; then
|
if arch-chroot /mnt <<-BOOTCTL > /dev/null 2>&1 ; then
|
||||||
bootctl --esp-path=/efi install || exit
|
|
||||||
echo "default arch.conf" > /boot/loader/loader.conf || exit
|
|
||||||
cat <<-SDBOOT_CONF > /boot/loader/entries/arch.conf || exit
|
|
||||||
title ${entrname}
|
|
||||||
linux /vmlinuz-${kernel}
|
|
||||||
initrd /initramfs-${kernel}.img
|
|
||||||
options rw ${boot_opts}
|
|
||||||
SDBOOT_CONF
|
|
||||||
systemctl enable systemd-boot-update || exit
|
|
||||||
BOOTCTL_NOUKI
|
|
||||||
stage_ok
|
|
||||||
else
|
|
||||||
stage_fail
|
|
||||||
fi
|
|
||||||
elif [[ "${uki}" == "y" ]]; then
|
|
||||||
if arch-chroot /mnt <<-BOOTCTL_UKI > /dev/null 2>&1 ; then
|
|
||||||
bootctl --esp-path=/efi install || exit
|
|
||||||
systemctl enable systemd-boot-update || exit
|
|
||||||
BOOTCTL_UKI
|
|
||||||
stage_ok
|
|
||||||
else
|
|
||||||
stage_fail
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [[ "${uki}" == "n" ]]; then
|
|
||||||
if arch-chroot /mnt <<-BOOTCTL_NOUKI > /dev/null 2>&1 ; then
|
|
||||||
bootctl install || exit
|
bootctl install || exit
|
||||||
echo "default arch.conf" > /boot/loader/loader.conf || exit
|
echo "default arch.conf" > /boot/loader/loader.conf || exit
|
||||||
cat <<-SDBOOT_CONF > /boot/loader/entries/arch.conf || exit
|
cat <<-SDBOOT_CONF > /boot/loader/entries/arch.conf || exit
|
||||||
|
|
@ -5378,16 +5400,16 @@ BOOTCTL_UKI
|
||||||
options rw ${boot_opts}
|
options rw ${boot_opts}
|
||||||
SDBOOT_CONF
|
SDBOOT_CONF
|
||||||
systemctl enable systemd-boot-update || exit
|
systemctl enable systemd-boot-update || exit
|
||||||
BOOTCTL_NOUKI
|
BOOTCTL
|
||||||
stage_ok
|
stage_ok
|
||||||
else
|
else
|
||||||
stage_fail
|
stage_fail
|
||||||
fi
|
fi
|
||||||
elif [[ "${uki}" == "y" ]]; then
|
elif [[ "${uki}" == "y" ]]; then
|
||||||
if arch-chroot /mnt <<-BOOTCTL_UKI > /dev/null 2>&1 ; then
|
if arch-chroot /mnt <<-BOOTCTL > /dev/null 2>&1 ; then
|
||||||
bootctl install || exit
|
bootctl install || exit
|
||||||
systemctl enable systemd-boot-update || exit
|
systemctl enable systemd-boot-update || exit
|
||||||
BOOTCTL_UKI
|
BOOTCTL
|
||||||
stage_ok
|
stage_ok
|
||||||
else
|
else
|
||||||
stage_fail
|
stage_fail
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue