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

replace sd with rg

Browse source
This commit is contained in:
Tobias Powalowski 2024-06-28 10:13:41 +02:00
parent aed43c70ea
commit 6f25fc153e
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/blockdevices.sh
View file

@ -565,7 +565,7 @@ _createpv()
echo "${_DEV}" >>/tmp/.pvs-create echo "${_DEV}" >>/tmp/.pvs-create
done done
# final step ask if everything is ok? # final step ask if everything is ok?
_dialog --yesno "Would you like to create physical volume on devices below?\n$(sd -p '$' '\n' /tmp/.pvs-create)" 0 0 && break _dialog --yesno "Would you like to create physical volume on devices below?\n$(rg '(.*$)' -r '$1\n' /tmp/.pvs-create)" 0 0 && break
done done
_DEV="$(echo -n "$(cat /tmp/.pvs-create)")" _DEV="$(echo -n "$(cat /tmp/.pvs-create)")"
#shellcheck disable=SC2028,SC2086 #shellcheck disable=SC2028,SC2086
@ -650,7 +650,7 @@ _createvg()
echo "${_PV}" >>/tmp/.pvs echo "${_PV}" >>/tmp/.pvs
done done
# final step ask if everything is ok? # final step ask if everything is ok?
_dialog --yesno "Would you like to create Volume Group like this?\n\n${_VGDEV}\n\nPhysical Volumes:\n$(sd -p '$' '\n' /tmp/.pvs)" 0 0 && break _dialog --yesno "Would you like to create Volume Group like this?\n\n${_VGDEV}\n\nPhysical Volumes:\n$(rg '(.*$)' -r '$1\n' /tmp/.pvs)" 0 0 && break
done done
_PV="$(echo -n "$(cat /tmp/.pvs)")" _PV="$(echo -n "$(cat /tmp/.pvs)")"
_umountall _umountall