albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove: Since systemd 255+ and mkinitcpio 38+, a lot of Swapping configuration has been deprecated due to systemd's amazing automation, so it has been removed (as being redundunt) from the installer, following the latest guidelines.

Browse source 
Add: Sanity Check > When several partition of the same type {root,ESP,home,swap} are detected, the installer will warn and manage ONLY the ones relevant to your currently detected preferences.
Indentation.
This commit is contained in:
Jane Doe 2024-06-23 15:35:58 +00:00
parent 28c3450b45
commit feee5e36c6
1 changed files with 12 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Amelia.sh
View file

@ -1,7 +1,7 @@
#!/bin/bash
# Amelia Installer
# Version: 5.8
# Version: 5.9
set -euo pipefail
trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR
@ -2629,7 +2629,7 @@ ${magenta}###${nc}--------------------------------------${magenta}[ ${bwhite}San
swap_dev="$(fdisk -l "${instl_drive}" | grep -E 'swap' | awk "{print \$1}")"
multi_swap="$(fdisk -l "${instl_drive}" | grep -E 'swap' | awk "{print \$1}" | cat --number)"
swap_comply="$(fdisk -l "${instl_drive}" | grep -E 'swap' | awk "{print \$1}" | cat --number | grep -E '1[[:blank:]]' | awk "{print \$2}")"
if [[ "${rootcount}" -gt "1" ]]; then
local prompt="Confirm /Root Partition"
local stage_prompt="Partition"
@ -2682,7 +2682,7 @@ ${multi_root}
return 1
fi
fi
if [[ "${bootcount}" -gt "1" ]]; then
local prompt="Confirm /Boot Partition"
local stage_prompt="Partition"
@ -2752,8 +2752,8 @@ ${multi_boot}
return 1
fi
fi
if [[ "${homecount}" -gt "1" ]]; then
if [[ ${fs} == "1" && "${homecount}" -gt "1" ]]; then
local prompt="Confirm /Home Partition"
local stage_prompt="Partition"
sleep 0.3
@ -2768,7 +2768,7 @@ ${multi_boot}
"
lsblk -f "${instl_drive}"|GREP_COLORS='mt=01;36' grep -E --color=always 'vfat|$'|GREP_COLORS='mt=01;32' grep -E --color=always 'ext4|$'|GREP_COLORS='mt=01;35' grep -E --color=always 'btrfs|$'|GREP_COLORS='mt=01;31' grep -E --color=always 'ntfs|$'|GREP_COLORS='mt=01;33' grep -E --color=always 'swap|$'
YELLOW "
YELLOW "
###-----------------------------------------------------------------------------------------------------------------###"
NC "
@ -2784,7 +2784,7 @@ ${multi_home}
### Partition ${nc}${home_comply} ${yellow}is auto-assigned as such and will be ${red}[!] FORMATTED [!]
"
"
BLUE "
@ -2804,8 +2804,8 @@ ${multi_home}
return 1
fi
fi
if [[ "${swapcount}" -gt "1" ]]; then
if [[ ${swapmode} == "1" && "${swapcount}" -gt "1" ]]; then
local prompt="Confirm /Swap Partition"
local stage_prompt="Partition"
sleep 0.3
@ -4437,7 +4437,7 @@ ${magenta}###${nc}-------------------------------------${magenta}[ ${bwhite}Pacs
if pacstrap -K -i /mnt ${deskpkgs} ; then
if [[ "${fs}" == "2" ]]; then
genfstab -t PARTUUID /mnt >> /mnt/etc/fstab > /dev/null 2>&1 || err_abort
genfstab -t PARTUUID /mnt >> /mnt/etc/fstab || err_abort
sleep 0.3
NC "
@ -4625,28 +4625,6 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
#### Unencrypted Setup Vars
elif [[ "${encrypt}" == "no" ]]; then
### Swap Setup
## Swap Partition
if [[ "${swapmode}" == "1" ]]; then
# Swap Partition Kernel Boot Options
swap_bootopts="resume=UUID=$(blkid -s UUID -o value "${swap_dev}") "
## Swapfile
elif [[ "${swapmode}" == "2" ]]; then
# Ext4 Offset
if [[ "${fs}" == "1" ]]; then
offst="$(filefrag -v /mnt/swapfile | awk '$1=="0:" {print substr($4, 1, length($4)-2)}')"
# Btrfs Offset
elif [[ "${fs}" == "2" ]]; then
offst="$(btrfs inspect-internal map-swapfile -r /mnt/swap/swapfile)"
fi
# Swapfile Kernel Boot Options
swap_bootopts="resume=UUID=$(blkid -s UUID -o value "${root_dev}") resume_offset=${offst} "
## No Swap
elif [[ "${swapmode}" == "3" ]]; then
# No Swap Kernel Boot Options
swap_bootopts=""
fi
### Graphics Setup
## Configuration = 'Yes'
if [[ "${vgaconf}" == "y" ]]; then
@ -4716,10 +4694,10 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
if [[ "${autoroot}" == "y" ]]; then
### Kernel Boot Options [Multi-Root Disk] (No Encryption)
boot_opts="${multiroot_opts}${swap_bootopts}${vga_bootopts}${cust_bootopts}${btrfs_bootopts}"
boot_opts="${multiroot_opts}${vga_bootopts}${cust_bootopts}${btrfs_bootopts}"
else
### Kernel Boot Options [Single Root Disk] (No Encryption)
boot_opts="${swap_bootopts}${vga_bootopts}${cust_bootopts}${btrfs_bootopts}"
boot_opts="${vga_bootopts}${cust_bootopts}${btrfs_bootopts}"
fi
fi