1. photon
  2. Commit b30515218e9a5d46f30771d5faf7fcaaf340bb98
Browse code

Used UUID to serch for boot partition in EFI grub. (This change fixd nvme boot issue.)

Change-Id: I4767b74de53272cb7c44edabc17c8f7e4ca15e7d
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2641
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Alexey Makhalov <amakhalov@vmware.com>

xiaolin-vmware authored on 2017/05/05 10:34:55
Showing 1 changed files
installer/mk-setup-grub.sh
History View file @ b305152
... ... 
@@ -34,7 +34,10 @@ grub_efi_install()
34 34 
     mkdir -p $BUILDROOT/boot/efi/EFI/Boot/
35 35 
     cp EFI/BOOT/* $BUILDROOT/boot/efi/EFI/Boot/
36 36 
     mkdir -p $BUILDROOT/boot/efi/boot/grub2
37 
-    echo "configfile (hd0,gpt${BOOT_PARTITION_NUMBER})${BOOT_DIRECTORY}grub2/grub.cfg" > $BUILDROOT/boot/efi/boot/grub2/grub.cfg
37 
+    cat > $BUILDROOT/boot/efi/boot/grub2/grub.cfg << EOF
38 
+search -n -u ${BOOT_UUID} -s
39 
+configfile ${BOOT_DIRECTORY}grub2/grub.cfg
40 
+EOF
38 41 
     umount $BUILDROOT/boot/efi
39 42 
 }
40 43