@@ -24,7 +24,9 @@ from actionresult import ActionResult

 from __builtin__ import isinstance

 class Installer(object):

-    def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

+    def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False,

+                 rpm_path = "../stage/RPMS", log_path = "../stage/LOGS",

+                 ks_config = None):

         self.install_config = install_config

         self.ks_config = ks_config

         self.iso_installer = iso_installer

@@ -149,15 +151,38 @@ class Installer(object):

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

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

             # install grub

+            if 'boot_partition_number' not in self.install_config['disk']:

+                self.install_config['disk']['boot_partition_number'] = 1

+

             try:

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

-                    process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "bios", self.install_config['disk']['disk'], self.install_config['disk']['root'], self.install_config['disk']['boot'], self.install_config['disk']['bootdirectory']], stdout=self.output)

+                    process = subprocess.Popen(

+                                  [self.setup_grub_command, '-w', self.photon_root,

+                                  "bios", self.install_config['disk']['disk'],

+                                  self.install_config['disk']['root'],

+                                  self.install_config['disk']['boot'],

+                                  self.install_config['disk']['bootdirectory'],

+                                  str(self.install_config['disk']['boot_partition_number'])],

+                                  stdout=self.output)

                 elif self.install_config['boot'] == 'efi':

-                    process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "efi", self.install_config['disk']['disk'], self.install_config['disk']['root'], self.install_config['disk']['boot'], self.install_config['disk']['bootdirectory']], stdout=self.output)

+                    process = subprocess.Popen(

+                                  [self.setup_grub_command, '-w', self.photon_root,

+                                  "efi", self.install_config['disk']['disk'],

+                                  self.install_config['disk']['root'],

+                                  self.install_config['disk']['boot'],

+                                  self.install_config['disk']['bootdirectory'],

+                                  str(self.install_config['disk']['boot_partition_number'])],

+                                  stdout=self.output)

             except:

                 #install bios if variable is not set.

-                process = subprocess.Popen([self.setup_grub_command, '-w', self.photon_root, "bios", self.install_config['disk']['disk'], self.install_config['disk']['root'], self.install_config['disk']['boot'], self.install_config['disk']['bootdirectory']], stdout=self.output)

-

+                process = subprocess.Popen(

+                              [self.setup_grub_command, '-w', self.photon_root,

+                              "bios", self.install_config['disk']['disk'],

+                              self.install_config['disk']['root'],

+                              self.install_config['disk']['boot'],

+                              self.install_config['disk']['bootdirectory'],

+                              str(self.install_config['disk']['boot_partition_number'])],

+                              stdout=self.output)

             retval = process.wait()

             self.update_fstab()

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

     then

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

     else

-         BOOT_PARTITION=${HDD}2

+         BOOT_PARTITION=${HDD}1

     fi

-    mkfs.vfat $BOOT_PARTITION

+    mkfs.fat $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/BOOT/* $BUILDROOT/boot/efi/EFI/Boot/

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

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

+    echo "configfile (hd0,gpt${BOOT_PARTITION_NUMBER})${BOOT_DIRECTORY}grub2/grub.cfg" > $BUILDROOT/boot/efi/boot/grub2/grub.cfg

     umount $BUILDROOT/boot/efi

 }

@@ -53,13 +53,14 @@ ARCH=$(uname -m)    # host architecture

 > ${LOGFILE}        #    clear/initialize logfile

 # Check if passing a HHD and partition

-if [ $# -eq 5 ] 

+if [ $# -eq 6 ]

     then

         BOOTMODE=$1

     HDD=$2

     ROOT_PARTITION_PATH=$3

     BOOT_PARTITION_PATH=$4

     BOOT_DIRECTORY=$5

+    BOOT_PARTITION_NUMBER=$6

 fi

 #

@@ -44,9 +44,16 @@ def partition_disk(disk, partitions):

     # Partitioning the disk

     extensible_partition = None

     partitions_count = len(partitions)

-    partition_number = 1

+    partition_number = 2

+    # Add part size and grub flags

+    grub_flag = ':ef02'

+    part_size = '+2M'

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

+        grub_flag = ':ef00'

+        part_size = '+3M'

+

     # Adding the bios partition

-    partition_cmd = ['sgdisk', '-n', `partitions_count + 1` + ':-2M:']

+    partition_cmd = ['sgdisk', '-n 1::' + part_size]

     # Adding the known size partitions

     for partition in partitions:

         if partition['size'] == 0:

@@ -77,12 +84,7 @@ def partition_disk(disk, partitions):

         log(LOG_ERROR, "Faild partition disk, command: {0}". format(partition_cmd))

         return None

-    # Add the grub flags

-    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)

+    process = subprocess.Popen(['sgdisk', '-t1' + grub_flag, disk], stdout = output)

     retval = process.wait()

     if retval != 0:

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

@@ -93,8 +95,10 @@ def partition_disk(disk, partitions):

         if "mountpoint" in partition:

             if partition['mountpoint'] == '/':

                 partitions_data['root'] = partition['path']

+                partitions_data['root_partition_number'] = partition['partition_number']

             elif partition['mountpoint'] == '/boot':

                 partitions_data['boot'] = partition['path']

+                partitions_data['boot_partition_number'] = partition['partition_number']

                 partitions_data['bootdirectory'] = '/'

         if partition['filesystem'] == "swap":

             process = subprocess.Popen(['mkswap', partition['path']], stdout = output)

@@ -116,10 +120,11 @@ def partition_disk(disk, partitions):

     if not 'boot' in partitions_data:

         partitions_data['boot'] = partitions_data['root']

+        partitions_data['boot_partition_number'] = partitions_data['root_partition_number']

         partitions_data['bootdirectory'] = '/boot/'

     partitions.sort(lambda p1,p2: partition_compare(p1, p2))

-	

+

     return partitions_data

 def replace_string_in_file(filename,  search_string,  replace_string):