mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
fix check
This commit is contained in:
parent
3e4c1bbbd3
commit
e6d3562926
1 changed files with 2 additions and 2 deletions
|
@ -1180,7 +1180,7 @@ _createpv()
|
||||||
# skip md partition devices, which already have lvm devices!
|
# skip md partition devices, which already have lvm devices!
|
||||||
for i in $PARTS; do
|
for i in $PARTS; do
|
||||||
mdcheck="$(echo $i | grep /dev/md_d | sed -e 's#p.*##g' -e 's#/dev/##g')"
|
mdcheck="$(echo $i | grep /dev/md_d | sed -e 's#p.*##g' -e 's#/dev/##g')"
|
||||||
if ! [ "$(find /sys/block/$mdcheck/ -name 'dm*' 2>/dev/null)" = "" ]; then
|
if ! [ "$(find /sys/block/$mdcheck/ -name 'dm*' 2>/dev/null)" = "" -a "$mdcheck" = "" ]; then
|
||||||
for k in $(find /sys/block/$mdcheck/ -name 'dm*' 2>/dev/null); do
|
for k in $(find /sys/block/$mdcheck/ -name 'dm*' 2>/dev/null); do
|
||||||
# check encrypted volume
|
# check encrypted volume
|
||||||
realdevice="$(cryptsetup status $(cat $k/dm/name) 2>/dev/null | grep "device:.*/dev/mapper/" | sed -e 's#.*\ ##g')"
|
realdevice="$(cryptsetup status $(cat $k/dm/name) 2>/dev/null | grep "device:.*/dev/mapper/" | sed -e 's#.*\ ##g')"
|
||||||
|
@ -1476,7 +1476,7 @@ _luks()
|
||||||
# skip md partition devices, which already has encrypted devices!
|
# skip md partition devices, which already has encrypted devices!
|
||||||
for i in $PARTS; do
|
for i in $PARTS; do
|
||||||
mdcheck="$(echo $i | grep /dev/md_d | sed -e 's#p.*##g' -e 's#/dev/##g')"
|
mdcheck="$(echo $i | grep /dev/md_d | sed -e 's#p.*##g' -e 's#/dev/##g')"
|
||||||
if ! [ "$(find /sys/block/$mdcheck/ -name 'dm*' 2>/dev/null)" = "" ]; then
|
if ! [ "$(find /sys/block/$mdcheck/ -name 'dm*' 2>/dev/null)" = "" -a "$mdcheck" = "" ]; then
|
||||||
for k in $(find /sys/block/$mdcheck/ -name 'dm*' 2>/dev/null); do
|
for k in $(find /sys/block/$mdcheck/ -name 'dm*' 2>/dev/null); do
|
||||||
cryptsetup status $(cat $k/dm/name) >/dev/null 2>&1 && ALREADYINUSE="$ALREADYINUSE $i"
|
cryptsetup status $(cat $k/dm/name) >/dev/null 2>&1 && ALREADYINUSE="$ALREADYINUSE $i"
|
||||||
# check lvm devices if encryption was used!
|
# check lvm devices if encryption was used!
|
||||||
|
|
Loading…
Reference in a new issue