root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

don't ask for FS on swap

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-12 18:31:43 +01:00
parent aa098c5eca
commit 2b076fb493
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/installer/mountpoints.sh
View file

@ -95,7 +95,7 @@ _create_filesystem() {
_SKIP_FILESYSTEM="" _SKIP_FILESYSTEM=""
_dialog --yesno "Would you like to create a filesystem on ${_DEVICE}?\n\n(This will overwrite existing data!)" 0 0 && _DOMKFS=1 _dialog --yesno "Would you like to create a filesystem on ${_DEVICE}?\n\n(This will overwrite existing data!)" 0 0 && _DOMKFS=1
if [[ -n "${_DOMKFS}" ]]; then if [[ -n "${_DOMKFS}" ]]; then
_select_filesystem || return 1 [[ "${_FSTYPE}" =="swap" ]] || _select_filesystem || return 1
while [[ -z "${_LABEL_NAME}" ]]; do while [[ -z "${_LABEL_NAME}" ]]; do
_dialog --inputbox "Enter the LABEL name for the device, keep it short\n(not more than 12 characters) and use no spaces or special\ncharacters." 10 65 \ _dialog --inputbox "Enter the LABEL name for the device, keep it short\n(not more than 12 characters) and use no spaces or special\ncharacters." 10 65 \
"$(${_LSBLK} LABEL "${_DEVICE}")" 2>"${_ANSWER}" || return 1 "$(${_LSBLK} LABEL "${_DEVICE}")" 2>"${_ANSWER}" || return 1
@ -294,7 +294,7 @@ _mkfs() {
fi fi
sleep 2 sleep 2
fi fi
if [[ "${2}" == "btrfs" && -n "${10}" && -n "${4}" ]]; then if [[ "${2}" == "btrfs" && -n "${10}" ]]; then
_create_btrfs_subvolume _create_btrfs_subvolume
fi fi
_btrfs_scan _btrfs_scan