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

fixed check on mapper device

Browse source
This commit is contained in:
Tobias Powalowski 2009-07-26 22:45:42 +02:00
parent cc44cf1b09
commit 0473c4282e
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/share/archboot/installer/setup
View file

@ -1180,7 +1180,7 @@ _createpv()
# skip md partition devices, which already have lvm devices!
for i in $PARTS; do
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)" = "" -a "$mdcheck" = "" ]; 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
# check encrypted volume
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!
for i in $PARTS; do
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)" = "" -a "$mdcheck" = "" ]; 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
cryptsetup status $(cat $k/dm/name) >/dev/null 2>&1 && ALREADYINUSE="$ALREADYINUSE $i"
# check lvm devices if encryption was used!