mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
more fixes
This commit is contained in:
parent
d11d9f7d8e
commit
4bbb4708dd
1 changed files with 7 additions and 4 deletions
|
@ -265,7 +265,7 @@ findpartitions() {
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
# include any mapped devices, only show dmraid partitions, remove part of encrypted devices, remove part of lvm!
|
# mapped devices, only show dmraid partitions, remove part of encrypted devices, remove part of lvm!
|
||||||
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
|
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
|
||||||
k="$(cryptsetup status $devpath 2>/dev/null | grep "device:.*/dev/mapper/" | sed -e 's#.*\ ##g')"
|
k="$(cryptsetup status $devpath 2>/dev/null | grep "device:.*/dev/mapper/" | sed -e 's#.*\ ##g')"
|
||||||
partofcrypt="$partofcrypt $k"
|
partofcrypt="$partofcrypt $k"
|
||||||
|
@ -282,10 +282,13 @@ findpartitions() {
|
||||||
done
|
done
|
||||||
# include none partitionable raid md devices
|
# include none partitionable raid md devices
|
||||||
for devpath in $(ls -d /dev/md* 2>/dev/null | grep md[0-9]); do
|
for devpath in $(ls -d /dev/md* 2>/dev/null | grep md[0-9]); do
|
||||||
if [ "$(cat /proc/mdstat 2>/dev/null | grep -w $(basename $devpath))" ]; then
|
# exlude md partitions which are part of lvm
|
||||||
|
if ! [ "$(blkid -c=/dev/null $devpath | grep "TYPE=\"lvm2pv\"")" -o "$(blkid -c=/dev/null $devpath | grep "TYPE=\"crypt_LUKS\"")" ]; then
|
||||||
|
if [ "$(cat /proc/mdstat 2>/dev/null | grep -w $(basename $devpath))" -a ! "$(cat /proc/mdstat 2>/dev/null | grep -w $(basename $devpath) | grep "dm-")" ]; then
|
||||||
echo "$devpath"
|
echo "$devpath"
|
||||||
[ "$1" ] && echo $1
|
[ "$1" ] && echo $1
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
# inlcude cciss controllers
|
# inlcude cciss controllers
|
||||||
if [ -d /dev/cciss ] ; then
|
if [ -d /dev/cciss ] ; then
|
||||||
|
|
Loading…
Reference in a new issue