Installer: add EFI boot entry for EFI installation

Also add haveged in ISO initrd to speed up installer load Change-Id: Iec161108baf7033ccadd80ae0d57a062e5f855d3 Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/5634 Reviewed-by: Anish Swaminathan <[email protected]> Tested-by: Anish Swaminathan <[email protected]>
ailen0ada · Sep 13, 2018 · f0eaa70 · f0eaa70
1 parent 38dc4ae
commit f0eaa70
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/common/data/packages_iso.json b/common/data/packages_iso.json
@@ -1,9 +1,9 @@
 {   
-    "packages": ["glibc","zlib","filesystem","file","gmp","libgcc","libstdc++","bash","sed",
+    "packages": ["glibc","zlib","filesystem","file","gmp","libgcc","libstdc++","bash","sed", "haveged",
                   "bzip2","pkg-config","python3-curses","ncurses", "cracklib","cracklib-dicts","python3-cracklib",
                   "shadow","coreutils","grep","readline","findutils","xz","util-linux","e2fsprogs",
                   "libffi","expat","linux","cpio","Linux-PAM","attr","libcap", "systemd","dbus",
                   "gzip", "sqlite","nspr","nss","popt","lua","rpm","gptfdisk","tar", "librepo",
                   "hawkey", "python3","python3-libs","pcre","glib", "tdnf", "python3-requests",
-                  "grub2-pc", "grub2-efi", "dracut", "curl", "dosfstools"]
+                  "grub2-pc", "grub2-efi", "efivar", "efibootmgr", "dracut", "curl", "dosfstools"]
 }
diff --git a/installer/mk-setup-grub.sh b/installer/mk-setup-grub.sh
@@ -36,16 +36,19 @@ grub_efi_install()
     if [ $(uname -m) == "aarch64" ]
     then
         cp EFI_aarch64/BOOT/* $BUILDROOT/boot/efi/EFI/Boot/
+        local EXE_NAME="bootaa64.efi"
     elif [ $(uname -m) == "x86_64" ]
     then
         cp EFI_x86_64/BOOT/* $BUILDROOT/boot/efi/EFI/Boot/
+        local EXE_NAME="bootx64.efi"
     fi
 
     mkdir -p $BUILDROOT/boot/efi/boot/grub2
     cat > $BUILDROOT/boot/efi/boot/grub2/grub.cfg << EOF
 search -n -u ${BOOT_UUID} -s
 configfile ${BOOT_DIRECTORY}grub2/grub.cfg
 EOF
+    efibootmgr --create --remove-dups --disk "$HDD" --part 1 --loader "/EFI/Boot/$EXE_NAME" --label Photon --verbose >&2
     umount $BUILDROOT/boot/efi
 }