@@ -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"]

 }

@@ -36,9 +36,11 @@ 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

@@ -46,6 +48,7 @@ grub_efi_install()

 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

 }