mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fix devicemapper shown in grub while using dmraid
This commit is contained in:
parent
9e48f4b900
commit
807d54fd6d
1 changed files with 16 additions and 2 deletions
|
@ -351,8 +351,10 @@ findbootloaderdisks() {
|
||||||
# dmraid devices
|
# dmraid devices
|
||||||
if [ -d /dev/mapper ] ; then
|
if [ -d /dev/mapper ] ; then
|
||||||
for fakeraid in $(dmraid -s -c); do
|
for fakeraid in $(dmraid -s -c); do
|
||||||
|
if [ "$(echo $fakeraid | grep '_')" ]; then
|
||||||
echo "/dev/mapper/$fakeraid"
|
echo "/dev/mapper/$fakeraid"
|
||||||
[ "$1" ] && echo $1
|
[ "$1" ] && echo $1
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
@ -400,7 +402,19 @@ findbootloaderpartitions() {
|
||||||
else
|
else
|
||||||
# only show dmraid partitions!
|
# only show dmraid partitions!
|
||||||
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
|
||||||
if ! [ "$(dmraid -s -c | grep $devpath$)" -a "$(dmraid -s -c | grep $devpath)" ]; then
|
k="$(blkid -c=/dev/null /dev/mapper/$devpath 2>/dev/null | grep "TYPE=\"crypt_LUKS\"" | sed -e 's#:.*##g')"
|
||||||
|
partofcrypt="$partofcrypt $k"
|
||||||
|
done
|
||||||
|
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
|
||||||
|
k="$(blkid -c=/dev/null /dev/mapper/$devpath 2>/dev/null | grep "TYPE=\"lvm2pv\"" | sed -e 's#:.*##g')"
|
||||||
|
partoflvm="$partoflvm $k"
|
||||||
|
done
|
||||||
|
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
|
||||||
|
k="$(blkid -c=/dev/null /dev/mapper/$devpath 2>/dev/null | grep "TYPE=\"mdraid\"" | sed -e 's#:.*##g')"
|
||||||
|
partofraid="$partofraid $k"
|
||||||
|
done
|
||||||
|
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
|
||||||
|
if ! [ "$(dmraid -s -c | grep $devpath$)" -o "$(ls $partofcrypt 2>/dev/null | grep /dev/mapper/$devpath$)" -o "$(ls $partoflvm 2>/dev/null | grep /dev/mapper/$devpath$)" -o "$(ls $partofraid 2>/dev/null | grep /dev/mapper/$devpath$)" -a "$(dmraid -s -c | grep $devpath)" ]; then
|
||||||
echo "/dev/mapper/$devpath"
|
echo "/dev/mapper/$devpath"
|
||||||
[ "$1" ] && echo $1
|
[ "$1" ] && echo $1
|
||||||
fi
|
fi
|
||||||
|
|
Loading…
Reference in a new issue