xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: empty mount options

Browse Source
This commit is contained in:
natemaia 2018-12-15 23:47:14 -08:00
parent 2c9759ac34
commit 7324ec38cb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/lib/mount.sh
View File

@ -107,13 +107,14 @@ select_mount_opts()
tput civis tput civis
if ! MNT_OPTS="$(dialog --cr-wrap --stdout --backtitle "$BT" --title " $title " \ if ! MNT_OPTS="$(dialog --cr-wrap --stdout --backtitle "$BT" --title " $title " \
--checklist "$_MntBody" 0 0 0 $opts | sed 's/ /,/g; $s/,$//')"; then --checklist "$_MntBody" 0 0 0 $opts | sed 's/ /,/g; $s/,$//')" || [[ $MNT_OPTS == "" ]]; then
return 1 return 1
fi fi
if ! yesno "$title" "$_MntConfBody $MNT_OPTS\n"; then if ! yesno "$title" "$_MntConfBody $MNT_OPTS\n"; then
select_mount_opts "$part" "$fs" || return 1 select_mount_opts "$part" "$fs" || return 1
fi fi
return 0 return 0
} }

1
src/lib/part.sh
View File

@ -225,7 +225,6 @@ auto_partition()
# confirm or bail # confirm or bail
yesno "$_PrepParts" "$_PartBody1 $device $msg ($size)$_PartBody3" || return 0 yesno "$_PrepParts" "$_PartBody1 $device $msg ($size)$_PartBody3" || return 0
infobox "$_PrepParts" "\nRemoving existing partitions on $device and setting partition table to $table\n" 1 infobox "$_PrepParts" "\nRemoving existing partitions on $device and setting partition table to $table\n" 1
swapoff -a # in case the device was previously used for swap swapoff -a # in case the device was previously used for swap
local dev_info local dev_info