X-Git-Url: https://iankelling.org/git/?p=automated-distro-installer;a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FGRUB_PC%2F10-setup;h=a78df0cb408dfa5b8b6b18773bfa7fbc80c7bb4e;hp=00829e110a7ecc3acff8ab60f789c4a9c3e9481c;hb=3d9cc96092cdc8aa05bc95cf83c07bb1af692013;hpb=b231c7038b1d0b6143f14a1a5efb90cd62aae876 diff --git a/fai/config/scripts/GRUB_PC/10-setup b/fai/config/scripts/GRUB_PC/10-setup index 00829e1..a78df0c 100755 --- a/fai/config/scripts/GRUB_PC/10-setup +++ b/fai/config/scripts/GRUB_PC/10-setup @@ -28,6 +28,11 @@ fi GROOT=$($ROOTCMD grub-probe -tdrive -d $BOOT_DEVICE) +# handle /boot in lvm-on-md +_bdev=$(readlink -f $BOOT_DEVICE) +if [ "${_bdev%%-*}" = "/dev/dm" ]; then + BOOT_DEVICE=$( lvs --noheadings -o devices $BOOT_DEVICE | sed -e 's/^*\([^(]*\)(.*$/\1/' ) +fi # Check if RAID is used for the boot device if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then @@ -38,14 +43,6 @@ if [[ $BOOT_DEVICE =~ '/dev/md' ]]; then echo Install grub on /dev/$device $ROOTCMD grub-install --no-floppy "/dev/$device" done - -elif [[ $GROOT =~ 'hostdisk' ]]; then - for dev in $BOOT_DEVICE; do - $ROOTCMD grub-install --no-floppy --modules=part_msdos $dev - if [ $? -eq 0 ]; then - echo "Grub installed on hostdisk $BOOT_DEVICE" - fi - done else for dev in $BOOT_DEVICE; do GROOT=$($ROOTCMD grub-probe -tdrive -d $dev)