From da2b2b5a0afb44f82402074b25ea4ffa624c308d Mon Sep 17 00:00:00 2001 From: Jane Doe Date: Tue, 25 Jun 2024 21:29:47 +0000 Subject: [PATCH] Change: 'Auto-Guided Installation' > The installer now offers the choice to 'Automagically' partition (Best Effort) the installation disk. The 'Partition Layout Preset' to be used, derives automatically from the current User Preferences. No additional user input is needed. When this option is used, and after successful stage completion, 'Sanity Check' will report the event as: 'Disk Auto-Formatted OK' --- Amelia.sh | 90 ++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 66 insertions(+), 24 deletions(-) diff --git a/Amelia.sh b/Amelia.sh index ebb2f76..79bba70 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -1,7 +1,7 @@ #!/bin/bash # Amelia Installer -# Version: 6.0 +# Version: 6.1 set -euo pipefail trap 's=$?; echo "$0: Error on line "$LINENO": $BASH_COMMAND"; exit $s' ERR @@ -2389,27 +2389,65 @@ Enter a Preset number: " case "${preset}" in 1) - sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 2:0:0 -t 2:8304 -c 2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail ;; + if [[ "${install}" == "yes" ]] ; then + autopart="yes" + sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 2:0:0 -t 2:8304 -c 2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail + until sanity_check; do : ; done + else + sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 2:0:0 -t 2:8304 -c 2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail + fi ;; 2) - until set_swapsize; do : ; done - sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 2:0:+"${swapsize}"G -t 2:8200 -c 2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 3:0:0 -t 3:8304 -c 3:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail ;; + if [[ "${install}" == "yes" ]] ; then + autopart="yes" + until set_swapsize; do : ; done + sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 2:0:+"${swapsize}"G -t 2:8200 -c 2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 3:0:0 -t 3:8304 -c 3:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail + until sanity_check; do : ; done + else + until set_swapsize; do : ; done + sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 2:0:+"${swapsize}"G -t 2:8200 -c 2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 3:0:0 -t 3:8304 -c 3:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail + fi ;; 3) - sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 2:0:+"${rootsize}"G -t 2:8304 -c 2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 3:0:0 -t 3:8302 -c 3:Home "${sgdrive}" > /dev/null 2>&1 || stage_fail ;; + if [[ "${install}" == "yes" ]] ; then + autopart="yes" + sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 2:0:+"${rootsize}"G -t 2:8304 -c 2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 3:0:0 -t 3:8302 -c 3:Home "${sgdrive}" > /dev/null 2>&1 || stage_fail + until sanity_check; do : ; done + else + sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 2:0:+"${rootsize}"G -t 2:8304 -c 2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 3:0:0 -t 3:8302 -c 3:Home "${sgdrive}" > /dev/null 2>&1 || stage_fail + fi ;; 4) - until set_swapsize; do : ; done - sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 2:0:+"${swapsize}"G -t 2:8200 -c 2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 3:0:+"${rootsize}"G -t 3:8304 -c 3:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail - sgdisk -n 4:0:0 -t 4:8302 -c 4:Home "${sgdrive}" > /dev/null 2>&1 || stage_fail ;; + if [[ "${install}" == "yes" ]] ; then + autopart="yes" + until set_swapsize; do : ; done + sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 2:0:+"${swapsize}"G -t 2:8200 -c 2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 3:0:+"${rootsize}"G -t 3:8304 -c 3:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 4:0:0 -t 4:8302 -c 4:Home "${sgdrive}" > /dev/null 2>&1 || stage_fail + until sanity_check; do : ; done + else + until set_swapsize; do : ; done + sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 2:0:+"${swapsize}"G -t 2:8200 -c 2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 3:0:+"${rootsize}"G -t 3:8304 -c 3:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail + sgdisk -n 4:0:0 -t 4:8302 -c 4:Home "${sgdrive}" > /dev/null 2>&1 || stage_fail + fi ;; "") sleep 0.3 RED " @@ -2422,10 +2460,6 @@ Enter a Preset number: " return 1 ;; esac - sleep 0.3 - NC " - -==> [${green}Disk ${sgdrive} OK${nc}] " if [[ "${install}" == "yes" ]]; then return 0 fi @@ -3019,7 +3053,14 @@ ${multi_swap} fi fi if [[ "${sanity}" == "ok" ]]; then - ok + if [[ "${autopart}" == "yes" ]]; then + sleep 0.3 + NC " + +==> [${green}Disk ${sgdrive} Auto-Formatted OK${nc}] " + else + ok + fi fi } ################################################################################################### @@ -5364,6 +5405,7 @@ NVIDIA_HOOK sgdrive="" cgdrive="" sep_home="" + autopart="" clear first_check