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 BLACKLISTING

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-25 11:09:38 +01:00
parent fb7d90c523
commit a0d788fcfb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
usr/lib/archboot/installer/blockdevices.sh
View file

@ -453,7 +453,7 @@ _createmd()
_DEVS="$(_finddevices)" _DEVS="$(_finddevices)"
if [[ -n "${_RAID_BLACKLIST}" ]]; then if [[ -n "${_RAID_BLACKLIST}" ]]; then
for dev in ${_RAID_BLACKLIST}; do for dev in ${_RAID_BLACKLIST}; do
_DEVS="${_DEVS/$(${_LSBLK} NAME,SIZE -d "${dev}")//}" _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}")/}"
done done
fi fi
# break if all devices are in use # break if all devices are in use
@ -590,7 +590,7 @@ _createpv()
_DEVS="$(_finddevices)" _DEVS="$(_finddevices)"
if [[ -n "${_LVM_BLACKLIST}" ]]; then if [[ -n "${_LVM_BLACKLIST}" ]]; then
for dev in ${_LVM_BLACKLIST}; do for dev in ${_LVM_BLACKLIST}; do
_DEVS="${_DEVS/$(${_LSBLK} NAME,SIZE -d "${dev}")//}" _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}")/}"
done done
fi fi
# break if all devices are in use # break if all devices are in use
@ -607,7 +607,7 @@ _createpv()
while [[ "${_DEV}" != "DONE" ]]; do while [[ "${_DEV}" != "DONE" ]]; do
_DEVNUMBER="$((_DEVNUMBER + 1))" _DEVNUMBER="$((_DEVNUMBER + 1))"
# clean loop from used partition and options # clean loop from used partition and options
_DEVS="${_DEVS/$(${_LSBLK} NAME,SIZE -d "${_DEV}")//}" _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${_DEV}")/}"
# add more devices # add more devices
#shellcheck disable=SC2086 #shellcheck disable=SC2086
_dialog --menu "Select additional device number ${_DEVNUMBER} for physical volume:" 15 60 12 ${_DEVS} DONE _ 2>"${_ANSWER}" || return 1 _dialog --menu "Select additional device number ${_DEVNUMBER} for physical volume:" 15 60 12 ${_DEVS} DONE _ 2>"${_ANSWER}" || return 1
@ -874,7 +874,7 @@ _createluks()
_DEVS="$(_finddevices)" _DEVS="$(_finddevices)"
if [[ -n "${_LUKS_BLACKLIST}" ]]; then if [[ -n "${_LUKS_BLACKLIST}" ]]; then
for dev in ${_LUKS_BLACKLIST}; do for dev in ${_LUKS_BLACKLIST}; do
_DEVS="${_DEVS/$(${_LSBLK} NAME,SIZE -d "${dev}")//}" _DEVS="${_DEVS//$(${_LSBLK} NAME,SIZE -d "${dev}")/}"
done done
fi fi
# break if all devices are in use # break if all devices are in use