mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
fix choose on empty string
This commit is contained in:
parent
e5580e63be
commit
d0dce9e72c
1 changed files with 2 additions and 3 deletions
|
@ -22,7 +22,7 @@ _clear_fs_values() {
|
||||||
: >/tmp/.btrfs-devices
|
: >/tmp/.btrfs-devices
|
||||||
_SKIP_FILESYSTEM=""
|
_SKIP_FILESYSTEM=""
|
||||||
_FS_TYPE=""
|
_FS_TYPE=""
|
||||||
_DOMKFS=""
|
_DOMKFS=0
|
||||||
_LABEL_NAME=""
|
_LABEL_NAME=""
|
||||||
_FS_OPTIONS=""
|
_FS_OPTIONS=""
|
||||||
_BTRFS_DEVS=""
|
_BTRFS_DEVS=""
|
||||||
|
@ -135,7 +135,6 @@ _check_mkfs_values() {
|
||||||
[[ -z "${_BTRFS_LEVEL}" ]] && _BTRFS_LEVEL="NONE"
|
[[ -z "${_BTRFS_LEVEL}" ]] && _BTRFS_LEVEL="NONE"
|
||||||
[[ -z "${_LABEL_NAME}" && -n "$(${_LSBLK} LABEL "${_DEV}")" ]] && _LABEL_NAME="$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")"
|
[[ -z "${_LABEL_NAME}" && -n "$(${_LSBLK} LABEL "${_DEV}")" ]] && _LABEL_NAME="$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")"
|
||||||
[[ -z "${_LABEL_NAME}" ]] && _LABEL_NAME="NONE"
|
[[ -z "${_LABEL_NAME}" ]] && _LABEL_NAME="NONE"
|
||||||
[[ -z "${_DOMKFS}" ]] && _DOMKFS="0"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
_run_mkfs() {
|
_run_mkfs() {
|
||||||
|
@ -187,7 +186,7 @@ _create_filesystem() {
|
||||||
_BTRFS_DEVS=""
|
_BTRFS_DEVS=""
|
||||||
_BTRFS_LEVEL=""
|
_BTRFS_LEVEL=""
|
||||||
_SKIP_FILESYSTEM=""
|
_SKIP_FILESYSTEM=""
|
||||||
[[ -z "${_DOMKFS}" ]] && _dialog --yesno "Would you like to create a filesystem on ${_DEV}?\n\n(This will overwrite existing data!)" 0 0 && _DOMKFS=1
|
[[ "${_DOMKFS}" == "0" ]] && _dialog --yesno "Would you like to create a filesystem on ${_DEV}?\n\n(This will overwrite existing data!)" 0 0 && _DOMKFS=1
|
||||||
if [[ "${_DOMKFS}" == "1" ]]; then
|
if [[ "${_DOMKFS}" == "1" ]]; then
|
||||||
[[ "${_FSTYPE}" == "swap" || "${_FSTYPE}" == "vfat" ]] || _select_filesystem || return 1
|
[[ "${_FSTYPE}" == "swap" || "${_FSTYPE}" == "vfat" ]] || _select_filesystem || return 1
|
||||||
while [[ -z "${_LABEL_NAME}" ]]; do
|
while [[ -z "${_LABEL_NAME}" ]]; do
|
||||||
|
|
Loading…
Reference in a new issue