@@ -5,5 +5,5 @@

                   "libffi","expat","linux","cpio","Linux-PAM","attr","libcap", "systemd","dbus",

                   "gzip", "sqlite-autoconf","nspr","nss","popt","lua","rpm","gptfdisk","tar", "librepo",

                   "hawkey", "python2","python2-libs","pcre","glib", "tdnf", "python-requests",

-                  "grub2","dracut", "curl", "ostree"]

+                  "grub2", "grub2-efi", "efibootmgr", "efivar","dracut", "curl", "ostree", "dosfstools"]

 }

deleted file mode 100644

Binary files a/installer/efi/bootx64.efi and /dev/null differ

@@ -145,6 +145,8 @@ class Installer(object):

             # Execute post installation modules

             self.execute_modules(modules.commons.POST_INSTALL)

+            if self.iso_installer and os.path.isdir("/sys/firmware/efi"):

+                self.install_config['boot'] = 'efi'

             # install grub

             try:

                 if self.install_config['boot'] == 'bios':

@@ -48,6 +48,8 @@ run_command "# 5" "cp boot/terminal_*.tga ${WORKINGDIR}/boot/grub2/themes/photon

 run_command "# 6" "cp boot/theme.txt ${WORKINGDIR}/boot/grub2/themes/photon/" "${LOGFILE}"

 run_command "echo : ${WORKINGDIR}" "echo ${WORKINGDIR}" "${LOGFILE}"

 cp BUILD_DVD/isolinux/splash.png ${BUILDROOT}/installer/boot/.

+mkdir -p ${BUILDROOT}/installer/EFI/BOOT

+cp EFI/BOOT/bootx64.efi ${BUILDROOT}/installer/EFI/BOOT/bootx64.efi

 if [ "$LIVE_CD" = true ] ; then

     mv ${WORKINGDIR}/isolinux/live-menu.cfg ${WORKINGDIR}/isolinux/menu.cfg

@@ -15,7 +15,7 @@

 grub_efi_install()

 {

-    mkdir $BUILDROOT/boot/efi

+    mkdir -p $BUILDROOT/boot/efi

     #

     # if it is a loop device then we should mount the dev mapped boot partition

     #

@@ -23,14 +23,16 @@ grub_efi_install()

     then

          BOOT_PARTITION=/dev/mapper/`basename ${HDD}`p1

     else

-         BOOT_PARTITION=${HDD}1

+         BOOT_PARTITION=${HDD}2

     fi

     mkfs.vfat $BOOT_PARTITION

     mount -t vfat $BOOT_PARTITION $BUILDROOT/boot/efi

     cp boot/unifont.pf2 /usr/share/grub/

     grub2-efi-install --target=x86_64-efi --efi-directory=$BUILDROOT/boot/efi --bootloader-id=Boot --root-directory=$BUILDROOT --recheck

     rm $BUILDROOT/boot/efi/EFI/Boot/grubx64.efi

-    cp efi/bootx64.efi $BUILDROOT/boot/efi/EFI/Boot/bootx64.efi

+    cp EFI/BOOT/bootx64.efi $BUILDROOT/boot/efi/EFI/Boot/bootx64.efi

+    mkdir -p $BUILDROOT/boot/efi/boot/grub2

+    echo "configfile (hd0,gpt1)/boot/grub2/grub.cfg" > $BUILDROOT/boot/efi/boot/grub2/grub.cfg

     umount $BUILDROOT/boot/efi

 }

@@ -71,12 +73,12 @@ mkdir -p $BUILDROOT/boot/grub2

 ln -sfv grub2 $BUILDROOT/boot/grub

 command -v grub-install >/dev/null 2>&1 && grubInstallCmd="grub-install" && { echo >&2 "Found grub-install"; }

 command -v grub2-install >/dev/null 2>&1 && grubInstallCmd="grub2-install" && { echo >&2 "Found grub2-install"; }

-if [ -z $grubInstallCmd ]; then

-echo "Unable to find grub install command"

-exit 1

-fi

-if [ "$BOOTMODE" == "bios" ]; then 

+if [ "$BOOTMODE" == "bios" ]; then

+    if [ -z $grubInstallCmd ]; then

+        echo "Unable to find grub install command"

+        exit 1

+    fi

     grub_mbr_install

 fi

 if [ "$BOOTMODE" == "efi" ]; then 

@@ -76,7 +76,11 @@ def partition_disk(disk, partitions):

         return None

     # Add the grub flags

-    process = subprocess.Popen(['sgdisk', '-t' + `partitions_count + 1` + ':ef02', disk], stdout = output)

+    grub_flag = ':ef02'

+    if os.path.isdir("/sys/firmware/efi"):

+        grub_flag = ':ef00'

+

+    process = subprocess.Popen(['sgdisk', '-t' + `partitions_count + 1` + grub_flag, disk], stdout = output)

     retval = process.wait()

     if retval != 0:

         log(LOG_ERROR, "Failed to setup grub partition")

@@ -39,33 +39,6 @@ def query_yes_no(question, default="no"):

             sys.stdout.write("Please respond with 'yes' or 'no' "

                              "(or 'y' or 'n').\n")

-def partition_disk(disk):

-    partitions_data = {}

-    partitions_data['disk'] = disk

-    partitions_data['root'] = disk + '2'

-    partitions_data['swap'] = disk + '3'

-

-    # Clear the disk

-    process = subprocess.Popen(['sgdisk', '-z', partitions_data['disk']])

-    retval = process.wait()

-

-    # 1: grub, 2: swap, 3: filesystem

-    process = subprocess.Popen(['sgdisk', '-n', '1::+2M', '-n', '3:-3G:', '-n', '2:', '-p', partitions_data['disk']])

-    retval = process.wait()

-

-    # Add the grub flags

-    process = subprocess.Popen(['sgdisk', '-t1:ef02', partitions_data['disk']])

-    retval = process.wait()

-

-    # format the swap

-    process = subprocess.Popen(['mkswap', partitions_data['swap']])

-    retval = process.wait()

-

-    # format the file system

-    process = subprocess.Popen(['mkfs', '-t', 'ext4', partitions_data['root']])

-    retval = process.wait()

-    return partitions_data

-

 def create_vmdk_and_partition(config, vmdk_path):

     partitions_data = {}