@@ -14,3 +14,11 @@ terminal-box : "terminal_*.tga"

 	selected_item_color = "#000000"

 }

++ label {

+        left = 50%-300

+        top = 95%

+        height = 30

+        width = 600

+        align = "center"

+        text = "@KEYMAP_SHORT@"

+}

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

                 shutil.copy(modules.commons.KS_POST_INSTALL_LOG_FILE_NAME,

                             self.photon_root + '/var/log/')

-            if self.install_config['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

@@ -385,6 +383,15 @@ class Installer(object):

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

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

                         stdout=self.output)

+                elif self.install_config['boot'] == 'dualboot':

+                    process = subprocess.Popen(

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

+                         "dualboot", 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(

@@ -21,12 +21,12 @@ grub_efi_install()

     #

     if [[ $HDD == *"loop"* ]]

     then

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

+         BOOT_PARTITION=/dev/mapper/`basename ${HDD}`p$EFI_PARTITION_NUMBER

     elif [[ $HDD == *"nvme"* || $HDD == *"mmcblk"* ]]

     then

-         BOOT_PARTITION=${HDD}p1

+         BOOT_PARTITION=${HDD}p$EFI_PARTITION_NUMBER

     else

-         BOOT_PARTITION=${HDD}1

+         BOOT_PARTITION=${HDD}$EFI_PARTITION_NUMBER

     fi

     mkfs.fat $BOOT_PARTITION

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

@@ -48,7 +48,7 @@ search -n -u ${BOOT_UUID} -s

 configfile ${BOOT_DIRECTORY}grub2/grub.cfg

 EOF

     # Some platforms do not support adding boot entry. Thus, ignore failures.

-    efibootmgr --create --remove-dups --disk "$HDD" --part 1 --loader "/EFI/Boot/$EXE_NAME" --label Photon --verbose >&2 || :

+    efibootmgr --create --remove-dups --disk "$HDD" --part $EFI_PARTITION_NUMBER --loader "/EFI/Boot/$EXE_NAME" --label Photon --verbose >&2 || :

     umount $BUILDROOT/boot/efi

 }

@@ -68,7 +68,6 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"    #    set log file name

 ARCH=$(uname -m)    # host architecture

 [ ${EUID} -eq 0 ]    || fail "${PRGNAME}: Need to be root user: FAILURE"

 > ${LOGFILE}        #    clear/initialize logfile

-

 # Check if passing a HHD and partition

 if [ $# -eq 6 ]

     then

@@ -78,6 +77,7 @@ if [ $# -eq 6 ]

     BOOT_PARTITION_PATH=$4

     BOOT_DIRECTORY=$5

     BOOT_PARTITION_NUMBER=$6

+    EFI_PARTITION_NUMBER="1"

 fi

 #

@@ -98,8 +98,16 @@ if [ "$BOOTMODE" == "bios" ]; then

         exit 1

     fi

     grub_mbr_install

-fi

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

+elif [ "$BOOTMODE" == "efi" ]; then

+    grub_efi_install

+elif [ "$BOOTMODE" == "dualboot" ]; then

+    EFI_PARTITION_NUMBER="2"

+    if [ -z $grubInstallCmd ]; then

+        echo "Unable to find grub install command"

+        exit 1

+    fi

+    grub_mbr_install

+

     grub_efi_install

 fi

@@ -41,21 +41,29 @@ def partition_disk(disk, partitions):

     if retval != 0:

         log(LOG_ERROR, "Failed clearing disk {0}".format(disk))

         return None

-

     # Partitioning the disk

     extensible_partition = None

     partitions_count = len(partitions)

-    partition_number = 2

+    partition_number = 3

     # 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'

+    bios_flag = ':ef02'

+    part_size = '+2M'

     # Adding the bios partition

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

+

+    efi_flag = ':ef00'

+    part_size = '+3M'

+    # Adding the efi partition

+    partition_cmd.extend(['-n 2::' + part_size])

     # Adding the known size partitions

+

+    arch = subprocess.check_output(['uname', '-m'], universal_newlines=True)

+    if "x86" not in arch:

+        partition_number = 2

+        # Adding the efi partition

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

+

     for partition in partitions:

         if partition['size'] == 0:

             # Can not have more than 1 extensible partition

@@ -86,12 +94,25 @@ def partition_disk(disk, partitions):

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

         return None

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

-    retval = process.wait()

-    if retval != 0:

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

-        return None

-

+    if "x86" not in arch:

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

+        retval = process.wait()

+        if retval != 0:

+            log(LOG_ERROR, "Failed to setup efi partition")

+            return None

+

+    else:

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

+        retval = process.wait()

+        if retval != 0:

+            log(LOG_ERROR, "Failed to setup bios partition")

+            return None

+

+        process = subprocess.Popen(['sgdisk', '-t2' + efi_flag, disk], stderr=output, stdout=output)

+        retval = process.wait()

+        if retval != 0:

+            log(LOG_ERROR, "Failed to setup efi partition")

+            return None

     # Format the filesystem

     for partition in partitions:

         if "mountpoint" in partition:

@@ -9,6 +9,7 @@ from menu import Menu

 from confirmwindow import ConfirmWindow

 import modules.commons

 from progressbar import ProgressBar

+import subprocess

 class SelectDisk(object):

     def __init__(self, maxy, maxx, install_config):

@@ -95,6 +96,11 @@ class SelectDisk(object):

             self.partition_window.adderror('Partitioning failed, you may try again')

         else:

             self.install_config['disk'] = partitions_data

+            arch = subprocess.check_output(['uname', '-m'], universal_newlines=True)

+            if "x86" in arch:

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

+            else:

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

         self.progress_bar.hide()

         return ActionResult(partitions_data != None, None)

@@ -136,7 +136,6 @@ def createIso(options):

     config['vmdk_install'] = False

     config['type'] = 'iso'

     config['working_directory'] = working_directory

-

     result = runInstaller(options, config)

     if not result:

         raise Exception("Installation process failed")

@@ -228,10 +227,12 @@ def verifyImageTypeAndConfig(config_file, img_name):

 def create_vmdk_and_partition(config, vmdk_path, disk_setup_script):

     partitions_data = {}

-

     firmware = "bios"

-    if 'boot' in config and config['boot'] == 'efi':

-        firmware = "efi"

+    if 'boot' in config:

+        if config['boot'] == 'efi':

+            firmware = "efi"

+        if config['boot'] == 'dualboot':

+            firmware = 'dualboot'

     process = subprocess.Popen([disk_setup_script, '-rp', config['size']['root'], '-sp',

                                 config['size']['swap'], '-n', vmdk_path, '-fm', firmware],

                                stdout=subprocess.PIPE)

@@ -176,6 +176,9 @@ def generateImage(raw_image_path, additional_rpms_path, tools_bin_path, src_root

     working_directory = os.path.dirname(raw_image_path)

     mount_path = os.path.splitext(raw_image_path)[0]

     build_scripts_path = os.path.dirname(os.path.abspath(__file__))

+    root_partition_no = 2

+    if 'boot' in config and config['boot'] == 'dualboot':

+        root_partition_no = 3

     if os.path.exists(mount_path) and os.path.isdir(mount_path):

         shutil.rmtree(mount_path)

@@ -186,9 +189,7 @@ def generateImage(raw_image_path, additional_rpms_path, tools_bin_path, src_root

     device_name = disk_device.split('/')[2]

     if not device_name:

         raise Exception("Could not create loop device and partition")

-

-    loop_device_path = "/dev/mapper/{}p2".format(device_name)

-

+    loop_device_path = "/dev/mapper/{}p{}".format(device_name, root_partition_no)

     print(loop_device_path)

     try:

@@ -76,28 +76,55 @@ echo "Associating loopdevice to raw disk"

 DISK_DEVICE=`losetup --show -f $VMDK_IMAGE_NAME`

 echo "Creating partition on raw disk"

-if [ $SWAP_PARTITION_SIZE -gt 0 ] 

+if [ $BOOT_FIRM_WARE = "dualboot" ]

 then

-      sgdisk -n 1::+8M -n 2::+${ROOT_PARTITION_SIZE}G -n 3: -p $DISK_DEVICE >> $LOGFILE

-else

-      sgdisk -n 1::+8M -n 2: -p $DISK_DEVICE >> $LOGFILE

-fi

+	if [ $SWAP_PARTITION_SIZE -gt 0 ] 

+	then

+	      sgdisk -n 1::+8M -n 2::+8M -n 3::+${ROOT_PARTITION_SIZE}G -n 4: -p $DISK_DEVICE >> $LOGFILE

+	else

+	      sgdisk -n 1::+8M -n 2::+8M -n 3: -p $DISK_DEVICE >> $LOGFILE

+	fi

-if [ $BOOT_FIRM_WARE = "efi" ]

-then

-    echo "EFI boot partition"

-    sgdisk -t1:ef00 $DISK_DEVICE >> $LOGFILE

+	echo "EFI boot partition"

+	sgdisk -t2:ef00 $DISK_DEVICE >> $LOGFILE

+

+	echo "BIOS boot partition"

+	sgdisk -t1:ef02 $DISK_DEVICE >> $LOGFILE

+

+	echo "Mapping device partition to loop device"

+	kpartx -avs $DISK_DEVICE >> $LOGFILE

+

+	DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `

+

+	echo "Adding file system to device partition"

+	mkfs -t ext4 /dev/mapper/${DEVICE_NAME}p3

+

+	echo "DISK_DEVICE=$DISK_DEVICE"

+	echo "ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p3"

 else

-    echo "BIOS boot partition"

-    sgdisk -t1:ef02 $DISK_DEVICE >> $LOGFILE

-fi

-echo "Mapping device partition to loop device"

-kpartx -avs $DISK_DEVICE >> $LOGFILE

+	if [ $SWAP_PARTITION_SIZE -gt 0 ] 

+	then

+	      sgdisk -n 1::+8M -n 2::+${ROOT_PARTITION_SIZE}G -n 3: -p $DISK_DEVICE >> $LOGFILE

+	else

+	      sgdisk -n 1::+8M -n 2: -p $DISK_DEVICE >> $LOGFILE

+	fi

-DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `

+	if [ $BOOT_FIRM_WARE = "efi" ]

+	then

+	    echo "EFI boot partition"

+	    sgdisk -t1:ef00 $DISK_DEVICE >> $LOGFILE

+	else

+	    echo "BIOS boot partition"

+	    sgdisk -t1:ef02 $DISK_DEVICE >> $LOGFILE

+	fi

+	echo "Mapping device partition to loop device"

+	kpartx -avs $DISK_DEVICE >> $LOGFILE

-echo "Adding file system to device partition"

-mkfs -t ext4 /dev/mapper/${DEVICE_NAME}p2

+	DEVICE_NAME=`echo $DISK_DEVICE|cut -c6- `

-echo "DISK_DEVICE=$DISK_DEVICE"

-echo "ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p2"

+	echo "Adding file system to device partition"

+	mkfs -t ext4 /dev/mapper/${DEVICE_NAME}p2

+

+	echo "DISK_DEVICE=$DISK_DEVICE"

+	echo "ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p2"

+fi

@@ -8,6 +8,7 @@

         },

     "packagelist_file": "packages_ova.json",

     "size": { "root": "16", "swap": "0" },

+    "boot":"dualboot",

     "public_key":"<ssh-key-here>",

     "expirepassword": true,

     "artifacttype": "ova",