mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
code cleanup
This commit is contained in:
parent
4753253d16
commit
e609592b55
1 changed files with 2 additions and 27 deletions
|
@ -635,21 +635,6 @@ _createpv()
|
||||||
|
|
||||||
#find physical volumes that are not in use
|
#find physical volumes that are not in use
|
||||||
_findpv()
|
_findpv()
|
||||||
{
|
|
||||||
for dev in $(${_LSBLK} NAME,FSTYPE | grep " LVM2_member$" | cut -d' ' -f1 | sort -u); do
|
|
||||||
# exclude checks:
|
|
||||||
#- not part of running lvm2
|
|
||||||
# ! "$(${_LSBLK} TYPE ${dev} | grep "lvm")"
|
|
||||||
#- not part of volume group
|
|
||||||
# $(pvs -o vg_name --noheading ${dev} | grep " $")
|
|
||||||
if ! ${_LSBLK} FSTYPE "${dev}" | grep -q "lvm" && pvs -o vg_name --noheading "${dev}" | grep -q " $"; then
|
|
||||||
echo "${dev}"
|
|
||||||
[[ "${1}" ]] && echo "${1}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
_getavailablepv()
|
|
||||||
{
|
{
|
||||||
for dev in $(${_LSBLK} NAME,FSTYPE | grep " LVM2_member$" | cut -d' ' -f1 | sort -u); do
|
for dev in $(${_LSBLK} NAME,FSTYPE | grep " LVM2_member$" | cut -d' ' -f1 | sort -u); do
|
||||||
# exclude checks:
|
# exclude checks:
|
||||||
|
@ -665,16 +650,6 @@ _getavailablepv()
|
||||||
|
|
||||||
#find volume groups that are not already full in use
|
#find volume groups that are not already full in use
|
||||||
_findvg()
|
_findvg()
|
||||||
{
|
|
||||||
for dev in $(vgs -o vg_name --noheading);do
|
|
||||||
if ! vgs -o vg_free --noheading --units m "${dev}" | grep -q " 0m$"; then
|
|
||||||
echo "${dev}"
|
|
||||||
[[ "${1}" ]] && echo "${1}"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
_getavailablevg()
|
|
||||||
{
|
{
|
||||||
for dev in $(vgs -o vg_name --noheading); do
|
for dev in $(vgs -o vg_name --noheading); do
|
||||||
if ! vgs -o vg_free --noheading --units m "${dev}" | grep -q " 0m$"; then
|
if ! vgs -o vg_free --noheading --units m "${dev}" | grep -q " 0m$"; then
|
||||||
|
@ -690,7 +665,7 @@ _createvg()
|
||||||
while [[ "${_VGFINISH}" != "DONE" ]]; do
|
while [[ "${_VGFINISH}" != "DONE" ]]; do
|
||||||
: >/tmp/.pvs
|
: >/tmp/.pvs
|
||||||
_VGDEV=""
|
_VGDEV=""
|
||||||
_PVS=$(_getavailablepv)
|
_PVS=$(_findpv)
|
||||||
# break if all devices are in use
|
# break if all devices are in use
|
||||||
if [[ -z "${_PVS}" ]]; then
|
if [[ -z "${_PVS}" ]]; then
|
||||||
_dialog --msgbox "No devices left for Volume Group creation." 0 0
|
_dialog --msgbox "No devices left for Volume Group creation." 0 0
|
||||||
|
@ -746,7 +721,7 @@ _createlv()
|
||||||
while [[ "${_LVFINISH}" != "DONE" ]]; do
|
while [[ "${_LVFINISH}" != "DONE" ]]; do
|
||||||
_LVDEV=""
|
_LVDEV=""
|
||||||
_LV_SIZE_SET=""
|
_LV_SIZE_SET=""
|
||||||
_LVS=$(_getavailablevg)
|
_LVS=$(_findvg)
|
||||||
# break if all devices are in use
|
# break if all devices are in use
|
||||||
if [[ -z "${_LVS}" ]]; then
|
if [[ -z "${_LVS}" ]]; then
|
||||||
_dialog --msgbox "No Volume Groups with free space available for Logical Volume creation." 0 0
|
_dialog --msgbox "No Volume Groups with free space available for Logical Volume creation." 0 0
|
||||||
|
|
Loading…
Reference in a new issue