root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

corrected dmraid exlude check in dm_devices

Browse source
This commit is contained in:
Tobias Powalowski 2010-08-25 06:46:03 +02:00
parent 5b51af3ec5
commit 29000d074f
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
usr/share/archboot/installer/setup
View file

@ -460,9 +460,15 @@ check_dm_devices() {
# - show device mapper devices
dm_devices() {
check_dm_devices
for i in $(dmraid -s -c); do
EXCLUDE_DMRAID=""
if [ "$(echo $i | grep '_')" ]; then
EXCLUDE_DMRAID="-v $EXCLUDE_DMRAID "
fi
done
if [ -d /dev/mapper ] ; then
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control); do
if ! [ "$(dmraid -s -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$)" ]; then
for devpath in $(ls /dev/mapper 2>/dev/null | grep -v control $EXCLUDE_DMRAID); do
if ! [ "$(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$)" ]; then
echo "/dev/mapper/$devpath"
[ "$1" ] && echo $1
fi
@ -1270,7 +1276,7 @@ findpv()
[ "$1" ] && echo $1
fi
fi
do
done
}
getavailablepv()