mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 19:40:37 +02:00
fix devicemapper check in grub stage
This commit is contained in:
parent
0473c4282e
commit
a482288d8f
1 changed files with 6 additions and 6 deletions
|
@ -2527,7 +2527,7 @@ dogrub() {
|
||||||
getcryptsetup
|
getcryptsetup
|
||||||
get_grub_map
|
get_grub_map
|
||||||
FAIL_RAID=""
|
FAIL_RAID=""
|
||||||
FAIL_LVM=""
|
FAIL_DM=""
|
||||||
if [ ! -f $DESTDIR/boot/grub/menu.lst ]; then
|
if [ ! -f $DESTDIR/boot/grub/menu.lst ]; then
|
||||||
DIALOG --msgbox "Error: Couldn't find $DESTDIR/boot/grub/menu.lst. Is GRUB installed?" 0 0
|
DIALOG --msgbox "Error: Couldn't find $DESTDIR/boot/grub/menu.lst. Is GRUB installed?" 0 0
|
||||||
return 1
|
return 1
|
||||||
|
@ -2557,7 +2557,7 @@ dogrub() {
|
||||||
elif [ "$(echo $PART_ROOT | grep /dev/mapper)" ]; then
|
elif [ "$(echo $PART_ROOT | grep /dev/mapper)" ]; then
|
||||||
# dmraid check
|
# dmraid check
|
||||||
if ! [ "$(dmsetup info $PART_ROOT | grep 'DMRAID')" ]; then
|
if ! [ "$(dmsetup info $PART_ROOT | grep 'DMRAID')" ]; then
|
||||||
FAIL_LVM="1"
|
FAIL_DM="1"
|
||||||
else
|
else
|
||||||
_grubdev=$(mapdev $PART_ROOT)
|
_grubdev=$(mapdev $PART_ROOT)
|
||||||
fi
|
fi
|
||||||
|
@ -2583,14 +2583,14 @@ dogrub() {
|
||||||
fi
|
fi
|
||||||
elif [ "$(echo $bootdev | grep /dev/mapper)" ]; then
|
elif [ "$(echo $bootdev | grep /dev/mapper)" ]; then
|
||||||
if ! [ "$(dmsetup info $bootdev | grep 'DMRAID')" ]; then
|
if ! [ "$(dmsetup info $bootdev | grep 'DMRAID')" ]; then
|
||||||
FAIL_LVM="1"
|
FAIL_DM="1"
|
||||||
else
|
else
|
||||||
|
FAIL_DM=""
|
||||||
_bootdev=$bootdev
|
_bootdev=$bootdev
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
# remove fail if /boot is on other device!
|
# remove fail if /boot is on other device!
|
||||||
! [ "$bootdev" = "" ] && FAIL_RAID=""
|
! [ "$bootdev" = "" ] && FAIL_RAID=""
|
||||||
! [ "$bootdev" = "" ] && FAIL_LVM=""
|
|
||||||
if [ "$(echo $bootdev | grep /dev/md_d)" ]; then
|
if [ "$(echo $bootdev | grep /dev/md_d)" ]; then
|
||||||
# partitionable raid is not supported by grub!
|
# partitionable raid is not supported by grub!
|
||||||
FAIL_RAID="1"
|
FAIL_RAID="1"
|
||||||
|
@ -2602,8 +2602,8 @@ dogrub() {
|
||||||
DIALOG --msgbox "Error: Grub cannot boot from none raid1 devices or partitionable raid devices!" 0 0
|
DIALOG --msgbox "Error: Grub cannot boot from none raid1 devices or partitionable raid devices!" 0 0
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if [ "$FAIL_LVM" = "1" ]; then
|
if [ "$FAIL_DM" = "1" ]; then
|
||||||
DIALOG --msgbox "Error: Grub cannot boot from lvm devices!" 0 0
|
DIALOG --msgbox "Error: Grub cannot boot from your created device mapper devices!" 0 0
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
if [ "$UUIDPARAMETER" = "yes" ]; then
|
if [ "$UUIDPARAMETER" = "yes" ]; then
|
||||||
|
|
Loading…
Reference in a new issue