summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2022-08-11 09:19:52 -0400
committerbill-auger <mr.j.spam.me@gmail.com>2022-08-16 08:12:58 -0400
commitd286c0110203c812c19bd44bd8ad0a420dadbe6d (patch)
treec64cb60b4690f88631a336bcfa30eea48911b4be
parent39a2a870c021fa0a9a7d27cbb8c0e70d86608d0d (diff)
bugfix partitioning
-rwxr-xr-xinstall.sh12
1 files changed, 9 insertions, 3 deletions
diff --git a/install.sh b/install.sh
index 9bd1eb9..9cf0d72 100755
--- a/install.sh
+++ b/install.sh
@@ -379,7 +379,9 @@ SelectEnv()
SelectPartition()
{
# prepare for partition probe
- umount /mnt &> /dev/null || true
+ umount /mnt/boot &> /dev/null || true
+ umount /mnt/home &> /dev/null || true
+ umount /mnt &> /dev/null || true
# checks to skip this stage per preset config
[[ -z "$(GetStateVar 'DEVICE_N' )" ]] ||
@@ -522,6 +524,7 @@ Partition()
declare -A partitions=( [Root]=$(GetStateVar 'ROOT_PART') \
[Boot]=$(GetStateVar 'BOOT_PART') \
[Home]=$(GetStateVar 'HOME_PART') )
+ local partition_role
local partition
local dlg_msg
@@ -529,8 +532,11 @@ Partition()
umount /mnt/boot &> /dev/null || true
umount /mnt/home &> /dev/null || true
umount /mnt &> /dev/null || true
- for partition in ${!partitions[@]}
- do dlg_msg="${partition} partiion: ${partitions[${partition}]} ${TR[format-${Lang}]}"
+ for partition_role in ${!partitions[@]}
+ do partition=${partitions[${partition_role}]}
+ dlg_msg="${partition_role} partiion: ${partition} ${TR[format-${Lang}]}"
+ [[ -n "${partition}" ]] || continue
+
# prompt to format un-formatted partiion
! blkid ${partition} | grep ' TYPE="' &> /dev/null && \
(( $( WizardDlg "${TR[dlg_part-${Lang}]}" --yesno "${dlg_msg}" 20 70 ) )) && \