Merge "Fix Grub configurations for Fedora images built on a UEFI host."

elements/vm/finalise.d/51-bootloader

@@ -169,6 +169,10 @@ function install_grub2 {
       if [ $(lsb_release -rs) = '19' ]; then
         sed -i "s%UUID=[A-Za-z0-9\-]*%LABEL=cloudimg-rootfs%" /etc/fstab
       fi
+      # Fix efi specific instructions in grub config file
+      if [ -d /sys/firmware/efi ]; then
+          sed -i 's%\(initrd\|linux\)efi /boot%\1 /boot%g' $GRUB_CFG
+      fi
     fi
 }