mirror of
https://gitlab.com/prism7/archery.git
synced 2025-02-15 08:29:17 +01:00
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 </dev/xxxxxx> Auto-Formatted OK'
This commit is contained in:
90
Amelia.sh
90
Amelia.sh
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Amelia Installer
|
# Amelia Installer
|
||||||
# Version: 6.0
|
# Version: 6.1
|
||||||
|
|
||||||
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
|
||||||
@@ -2389,27 +2389,65 @@ Enter a Preset number: "
|
|||||||
|
|
||||||
case "${preset}" in
|
case "${preset}" in
|
||||||
1)
|
1)
|
||||||
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
if [[ "${install}" == "yes" ]] ; then
|
||||||
sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
autopart="yes"
|
||||||
sgdisk -n 2:0:0 -t 2:8304 -c 2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail ;;
|
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)
|
2)
|
||||||
until set_swapsize; do : ; done
|
if [[ "${install}" == "yes" ]] ; then
|
||||||
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
autopart="yes"
|
||||||
sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
until set_swapsize; do : ; done
|
||||||
sgdisk -n 2:0:+"${swapsize}"G -t 2:8200 -c 2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -o "${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 ;;
|
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)
|
3)
|
||||||
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
if [[ "${install}" == "yes" ]] ; then
|
||||||
sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
autopart="yes"
|
||||||
sgdisk -n 2:0:+"${rootsize}"G -t 2:8304 -c 2:Root "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -o "${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 ;;
|
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)
|
4)
|
||||||
until set_swapsize; do : ; done
|
if [[ "${install}" == "yes" ]] ; then
|
||||||
sgdisk -o "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
autopart="yes"
|
||||||
sgdisk -n 1:0:+512M -t 1:ef00 -c 1:ESP "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
until set_swapsize; do : ; done
|
||||||
sgdisk -n 2:0:+"${swapsize}"G -t 2:8200 -c 2:Swap "${sgdrive}" > /dev/null 2>&1 || stage_fail
|
sgdisk -o "${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 1:0:+512M -t 1:ef00 -c 1:ESP "${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 ;;
|
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
|
sleep 0.3
|
||||||
RED "
|
RED "
|
||||||
@@ -2422,10 +2460,6 @@ Enter a Preset number: "
|
|||||||
return 1 ;;
|
return 1 ;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
sleep 0.3
|
|
||||||
NC "
|
|
||||||
|
|
||||||
==> [${green}Disk ${sgdrive} OK${nc}] "
|
|
||||||
if [[ "${install}" == "yes" ]]; then
|
if [[ "${install}" == "yes" ]]; then
|
||||||
return 0
|
return 0
|
||||||
fi
|
fi
|
||||||
@@ -3019,7 +3053,14 @@ ${multi_swap}
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
if [[ "${sanity}" == "ok" ]]; then
|
if [[ "${sanity}" == "ok" ]]; then
|
||||||
ok
|
if [[ "${autopart}" == "yes" ]]; then
|
||||||
|
sleep 0.3
|
||||||
|
NC "
|
||||||
|
|
||||||
|
==> [${green}Disk ${sgdrive} Auto-Formatted OK${nc}] "
|
||||||
|
else
|
||||||
|
ok
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
@@ -5364,6 +5405,7 @@ NVIDIA_HOOK
|
|||||||
sgdrive=""
|
sgdrive=""
|
||||||
cgdrive=""
|
cgdrive=""
|
||||||
sep_home=""
|
sep_home=""
|
||||||
|
autopart=""
|
||||||
|
|
||||||
clear
|
clear
|
||||||
first_check
|
first_check
|
||||||
|
Reference in New Issue
Block a user