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

fix new .parts syntax

Browse source
This commit is contained in:
Tobias Powalowski 2024-02-08 18:58:34 +01:00
parent e7d8474f0e
commit ab89444c0d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,8 +79,8 @@ _check_btrfs_filesystem_creation() {
_DETECT_CREATE_FILESYSTEM=""
_SKIP_FILESYSTEM=""
#shellcheck disable=SC2013
for i in $(grep "${_DEV}[:#]" /tmp/.parts); do
if echo "${i}" | grep -q ":btrfs:"; then
for i in $(grep "${_DEV}[|#]" /tmp/.parts); do
if echo "${i}" | grep -q "|btrfs|"; then
_FSTYPE="btrfs"
_SKIP_FILESYSTEM=1
# check on filesystem creation, skip subvolume asking then!

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

@ -86,7 +86,7 @@ _enter_mountpoint() {
grep -qw "/srv" /tmp/.parts && _MP=/var
_dialog --no-cancel --title " Mountpoint for ${_DEV} " --inputbox "" 7 65 "${_MP}" 2>"${_ANSWER}" || return 1
_MP=$(cat "${_ANSWER}")
if grep ":${_MP}:" /tmp/.parts; then
if grep "|${_MP}|" /tmp/.parts; then
_dialog --msgbox "ERROR: You have defined 2 identical mountpoints! Please select another mountpoint." 8 65
_MP=""
fi
@ -168,7 +168,7 @@ _create_filesystem() {
_dialog --no-cancel --title " LABEL Name on ${_DEV} " --inputbox "Keep it short and use no spaces or special characters." 8 60 \
"$(${_LSBLK} LABEL "${_DEV}" 2>"${_NO_LOG}")" 2>"${_ANSWER}" || return 1
_LABEL_NAME=$(cat "${_ANSWER}")
if grep ":${_LABEL_NAME}$" /tmp/.parts; then
if grep "|${_LABEL_NAME}$" /tmp/.parts; then
_dialog --title " ERROR " --no-mouse --infobox "You have defined 2 identical LABEL names! Please enter another name." 3 60
sleep 5
_LABEL_NAME=""