mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
bump to latest version
This commit is contained in:
parent
accef259ac
commit
4ec44c3820
1 changed files with 3 additions and 3 deletions
|
@ -447,9 +447,9 @@ _mkfs() {
|
||||||
swapoff -a &>"${_NO_LOG}"
|
swapoff -a &>"${_NO_LOG}"
|
||||||
if [[ -n "${4}" ]]; then
|
if [[ -n "${4}" ]]; then
|
||||||
if echo "${1}" | grep -q '^/dev'; then
|
if echo "${1}" | grep -q '^/dev'; then
|
||||||
mkswap -L "${6}" ${1} &>"${_LOG}" || _SWAP_ERROR=1
|
mkswap -L "${6}" ${1} &>"${_LOG}" || _MP_ERROR=1
|
||||||
else
|
else
|
||||||
mkswap "${7}" -U clear -L "${6}" -F "${1}" &>"${_LOG}" || _SWAP_ERROR=1
|
mkswap "${7}" -U clear -L "${6}" -F "${1}" &>"${_LOG}" || _MP_ERROR=1
|
||||||
fi
|
fi
|
||||||
#shellcheck disable=SC2181
|
#shellcheck disable=SC2181
|
||||||
if [[ -n "${_MP_ERROR}" ]]; then
|
if [[ -n "${_MP_ERROR}" ]]; then
|
||||||
|
@ -458,7 +458,7 @@ _mkfs() {
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
swapon "${1}" &>"${_LOG}" || _SWAP_ERROR=1
|
swapon "${1}" &>"${_LOG}" || _MP_ERROR=1
|
||||||
if [[ -n "${_MP_ERROR}" ]]; then
|
if [[ -n "${_MP_ERROR}" ]]; then
|
||||||
_progress "100" "ERROR: Activating swap ${1}"
|
_progress "100" "ERROR: Activating swap ${1}"
|
||||||
sleep 5
|
sleep 5
|
||||||
|
|
Loading…
Reference in a new issue