Compare commits

..

3 commits

Author SHA1 Message Date
Tobias Powalowski
3eb2ed33b9 silence checks 2023-06-28 22:26:58 +02:00
Tobias Powalowski
eb09228685 silence checks 2023-06-28 22:17:48 +02:00
Tobias Powalowski
f9aa35d786 silence checks 2023-06-28 22:10:28 +02:00
2 changed files with 4 additions and 4 deletions

View file

@ -134,13 +134,13 @@ _partitionable_raid_devices_partitions() {
_dmraid_devices() {
# isw_raid_member, managed by mdadm
for dev in $(${_LSBLK} NAME,TYPE 2>"${_NO_LOG}" | grep " raid.*$" | cut -d' ' -f 1 | sort -u); do
if ${_LSBLK} NAME,FSTYPE -s "${dev}" | grep "isw_raid_member$"; then
if ${_LSBLK} NAME,FSTYPE -s "${dev}" | grep -q "isw_raid_member$"; then
${_LSBLK} NAME,SIZE -d "${dev}"
fi
done
# ddf_raid_member, managed by mdadm
for dev in $(${_LSBLK} NAME,TYPE 2>"${_NO_LOG}" | grep " raid.*$" | cut -d' ' -f 1 | sort -u); do
if ${_LSBLK} NAME,FSTYPE -s "${dev}" | grep "ddf_raid_member$"; then
if ${_LSBLK} NAME,FSTYPE -s "${dev}" | grep -q "ddf_raid_member$"; then
${_LSBLK} NAME,SIZE -d "${dev}"
fi
done

View file

@ -33,13 +33,13 @@ _getraidarrays() {
_getcryptsetup() {
_LUKSSETUP=""
if ! cryptsetup status "$(basename "${_ROOTDEV}")" | grep -q inactive; then
if cryptsetup status "$(basename "${_ROOTDEV}")"; then
if cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}"; then
if [[ "${_NAME_SCHEME_PARAMETER}" == "FSUUID" ]]; then
_LUKSDEV="UUID=$(${_LSBLK} UUID "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g')")"
elif [[ "${_NAME_SCHEME_PARAMETER}" == "FSLABEL" ]]; then
_LUKSDEV="LABEL=$(${_LSBLK} LABEL "$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g')")"
else
_LUKSDEV="$(cryptsetup status "$(basename "${_ROOTDEV}")" | grep device: | sed -e 's#device:##g'))"
_LUKSDEV="$(cryptsetup status "$(basename "${_ROOTDEV}")" 2>"${_NO_LOG}" | grep device: | sed -e 's#device:##g'))"
fi
_LUKSNAME="$(basename "${_ROOTDEV}")"
_LUKSSETUP="cryptdevice=${_LUKSDEV}:${_LUKSNAME}"