mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix double detection
This commit is contained in:
parent
1e8d677456
commit
08ac29c20d
1 changed files with 2 additions and 2 deletions
|
@ -111,7 +111,7 @@ _enter_mountpoint() {
|
||||||
_dialog --no-cancel --title " Mountpoint for ${_DEV} " --inputbox "" 7 65 "${_MP}" 2>"${_ANSWER}" || return 1
|
_dialog --no-cancel --title " Mountpoint for ${_DEV} " --inputbox "" 7 65 "${_MP}" 2>"${_ANSWER}" || return 1
|
||||||
_MP=$(cat "${_ANSWER}")
|
_MP=$(cat "${_ANSWER}")
|
||||||
if [[ "$(rg -F "|${_MP}|" /tmp/.parts | cut -d '|' -f 3)" == "${_MP}" ]]; then
|
if [[ "$(rg -F "|${_MP}|" /tmp/.parts | cut -d '|' -f 3)" == "${_MP}" ]]; then
|
||||||
_dialog --msgbox "ERROR: You have defined 2 identical mountpoints! Please select another mountpoint." 8 65
|
_dialog --msgbox "ERROR: You have defined 2 identical mountpoints!\nPlease select another mountpoint." 4 65
|
||||||
_MP=""
|
_MP=""
|
||||||
sleep 3
|
sleep 3
|
||||||
fi
|
fi
|
||||||
|
@ -194,7 +194,7 @@ _create_filesystem() {
|
||||||
"$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")" 2>"${_ANSWER}" || return 1
|
"$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")" 2>"${_ANSWER}" || return 1
|
||||||
_LABEL_NAME=$(cat "${_ANSWER}")
|
_LABEL_NAME=$(cat "${_ANSWER}")
|
||||||
if [[ "$(rg -F "|${_LABEL_NAME}|" /tmp/.parts | cut -d '|' -f5)" == "${_LABEL_NAME}" ]]; then
|
if [[ "$(rg -F "|${_LABEL_NAME}|" /tmp/.parts | cut -d '|' -f5)" == "${_LABEL_NAME}" ]]; then
|
||||||
_dialog --title " ERROR " --no-mouse --infobox "You have defined 2 identical LABEL names! Please enter another name." 3 65
|
_dialog --title " ERROR " --no-mouse --infobox "You have defined 2 identical LABEL names!\nPlease enter another name." 4 65
|
||||||
sleep 3
|
sleep 3
|
||||||
_LABEL_NAME=""
|
_LABEL_NAME=""
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue