@@ -62,7 +62,7 @@ cd $BUILD_SCRIPTS_PATH

 DISK_DEVICE=`losetup --show -f ${PHOTON_IMG_OUTPUT_PATH}/photon-${IMG_NAME}.raw`

 echo "Mapping device partition to loop device"

-kpartx -av $DISK_DEVICE

+kpartx -avs $DISK_DEVICE

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

@@ -83,6 +83,8 @@ rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow.bak

 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow-

 rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/machine-id

 touch $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/machine-id

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab

+echo "/dev/sda2    /    ext4    defaults,barrier,noatime,noacl,data=ordered 1 1" >> $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab

 mount -o bind /proc $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/proc

 mount -o bind /dev $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/dev

@@ -99,16 +101,6 @@ fi

 if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ] && [ $IMG_NAME != "ova_ovs" ]

   then

-    #Copy the initrd image

-    rm -rf /tmp/initrd*

-    rm -rf /tmp/installer

-    cp $ISO_MOUNT_FOLDER/isolinux/initrd.img /tmp/initrd.gz

-    gunzip /tmp/initrd.gz

-    cd /tmp

-    cpio -idu < initrd

-    cp /tmp/installer/boot/initrd.img* $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/boot/

-    rm -rf /tmp/initrd*

-    rm -rf /tmp/installer

     cd $BUILD_SCRIPTS_PATH

     if [ $IMG_NAME = "gce" ]

       then

@@ -15,11 +15,21 @@

 grub_efi_install()

 {

     mkdir $BUILDROOT/boot/efi

-    mkfs.vfat /dev/sda1

-    mount -t vfat /dev/sda1 $BUILDROOT/boot/efi

+    #

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

+    #

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

+    then

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

+    else

+         BOOT_PARTITION=${HDD}1

+    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 --debug

-    mv $BUILDROOT/boot/efi/EFI/Boot/grubx64.efi $BUILDROOT/boot/efi/EFI/Boot/bootx64.efi

+    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

     umount $BUILDROOT/boot/efi

 }

@@ -40,20 +50,24 @@ 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 3 ] 

-	then

-        BOOTMODE=$1

-		HDD=$2

-		PARTITION=$3

+# Check if passing a HDD and partition

+if [ $# -eq 5 ] 

+    then

+       BOOTMODE=$1

+       HDD=$2

+       ROOT_PARTITION_PATH=$3

+       BOOT_PARTITION_PATH=$4

+       BOOT_DIRECTORY=$5

 fi

 #

-#   Install grub2.

+#	Install grub2.

 #

+UUID=$(blkid -s UUID -o value $ROOT_PARTITION_PATH)

+BOOT_UUID=$(blkid -s UUID -o value $BOOT_PARTITION_PATH)

 echo "Changing boot loader to MBR type on raw disk"

+

 sgdisk -m 1:2 "$HDD"

-UUID=$(blkid -s UUID -o value $PARTITION)

 grubInstallCmd=""

 mkdir -p $BUILDROOT/boot/grub2

@@ -64,10 +78,11 @@ if [ -z $grubInstallCmd ]; then

 echo "Unable to find grub install command"

 exit 1

 fi

-

+echo "Current directory is"

+pwd

 cp boot/unifont.pf2 ${BUILDROOT}/boot/grub2/

 mkdir -p ${BUILDROOT}/boot/grub2/themes/photon

-cp boot/splash.tga ${BUILDROOT}/boot/grub2/themes/photon/photon.tga

+cp boot/splash.png ${BUILDROOT}/boot/grub2/themes/photon/photon.png

 cp boot/terminal_*.tga ${BUILDROOT}/boot/grub2/themes/photon/

 cp boot/theme.txt ${BUILDROOT}/boot/grub2/themes/photon/

@@ -149,11 +164,11 @@ menuentry 'GNU/Linux' --class gnu-linux --class gnu --class os $menuentry_id_opt

     else

       search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER

     fi

-    echo    'Loading Linux 4.2.0 ...'

-    linux   /boot/vmlinuz-4.2.0 root=/dev/sda2 ro console=ttyS0,38400n8 

+    echo    'Loading Linux 4.4.7 ...'

+    linux   /boot/vmlinuz-4.4.7 root=/dev/sda2 ro console=ttyS0,38400n8 

 }

 submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced-UUID_PLACEHOLDER' {

-    menuentry 'GNU/Linux, with Linux 4.2.0' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.2.0-advanced-UUID_PLACEHOLDER' {

+    menuentry 'GNU/Linux, with Linux 4.4.7' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.4.7-advanced-UUID_PLACEHOLDER' {

         load_video

         set gfxpayload=keep

         insmod gzio

@@ -165,10 +180,10 @@ submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced

         else

           search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER

         fi

-        echo    'Loading Linux 4.2.0 ...'

-        linux   /boot/vmlinuz-4.2.0 root=/dev/sda2 ro console=ttyS0,38400n8 

+        echo    'Loading Linux 4.4.7 ...'

+        linux   /boot/vmlinuz-4.4.7 root=/dev/sda2 ro console=ttyS0,38400n8 

     }

-    menuentry 'GNU/Linux, with Linux 4.2.0 (recovery mode)' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.2.0-recovery-UUID_PLACEHOLDER' {

+    menuentry 'GNU/Linux, with Linux 4.4.7 (recovery mode)' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.4.7-recovery-UUID_PLACEHOLDER' {

         load_video

         set gfxpayload=keep

         insmod gzio

@@ -180,8 +195,8 @@ submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced

         else

           search --no-floppy --fs-uuid --set=root UUID_PLACEHOLDER

         fi

-        echo    'Loading Linux 4.2.0 ...'

-        linux   /boot/vmlinuz-4.2.0 root=/dev/sda2 ro single console=ttyS0,38400n8

+        echo    'Loading Linux 4.4.7 ...'

+        linux   /boot/vmlinuz-4.4.7 root=/dev/sda2 ro single console=ttyS0,38400n8

     }

 }

@@ -15,11 +15,21 @@

 grub_efi_install()

 {

     mkdir $BUILDROOT/boot/efi

-    mkfs.vfat /dev/sda1

-    mount -t vfat /dev/sda1 $BUILDROOT/boot/efi

+    #

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

+    #

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

+    then

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

+    else

+         BOOT_PARTITION=${HDD}1

+    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 --debug

-    mv $BUILDROOT/boot/efi/EFI/Boot/grubx64.efi $BUILDROOT/boot/efi/EFI/Boot/bootx64.efi

+    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

     umount $BUILDROOT/boot/efi

 }

@@ -31,6 +41,7 @@ grub_mbr_install()

 set -o errexit		# exit if error...insurance ;)

 set -o nounset		# exit if variable not initalized

 set +h			# disable hashall

+set -x

 PRGNAME=${0##*/}	# script name minus the path

 source config.inc		#	configuration parameters

 source function.inc		#	commonn functions

@@ -40,18 +51,22 @@ 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 3 ] 

-	then

-        BOOTMODE=$1

-		HDD=$2

-		PARTITION=$3

+# Check if passing a HDD and partition

+if [ $# -eq 5 ] 

+    then

+       BOOTMODE=$1

+       HDD=$2

+       ROOT_PARTITION_PATH=$3

+       BOOT_PARTITION_PATH=$4

+       BOOT_DIRECTORY=$5

 fi

 #

 #	Install grub2.

 #

-UUID=$(blkid -s UUID -o value $PARTITION)

+UUID=$(blkid -s UUID -o value $ROOT_PARTITION_PATH)

+BOOT_UUID=$(blkid -s UUID -o value $BOOT_PARTITION_PATH)

+

 grubInstallCmd=""

 mkdir -p $BUILDROOT/boot/grub2

@@ -72,7 +87,7 @@ fi

 cp boot/unifont.pf2 ${BUILDROOT}/boot/grub2/

 mkdir -p ${BUILDROOT}/boot/grub2/themes/photon

-cp boot/splash.tga ${BUILDROOT}/boot/grub2/themes/photon/photon.tga

+cp boot/splash.png ${BUILDROOT}/boot/grub2/themes/photon/photon.png

 cp boot/terminal_*.tga ${BUILDROOT}/boot/grub2/themes/photon/

 cp boot/theme.txt ${BUILDROOT}/boot/grub2/themes/photon/

 cat > "$BUILDROOT"/boot/grub2/grub.cfg << "EOF"

@@ -85,6 +100,7 @@ loadfont /boot/grub2/unifont.pf2

 insmod gfxterm

 insmod vbe

 insmod tga

+insmod png

 set gfxmode="640x480"

 gfxpayload=keep

@@ -96,7 +112,7 @@ set theme=/boot/grub2/themes/photon/theme.txt

 menuentry "Photon" {

 	insmod ext2

     insmod part_gpt

-	linux /boot/vmlinuz-4.2.0 init=/lib/systemd/systemd root=UUID=UUID_PLACEHOLDER loglevel=3 ro

+	linux /boot/vmlinuz-4.4.7 init=/lib/systemd/systemd root=UUID=UUID_PLACEHOLDER loglevel=7 ro

 	initrd /boot/initrd.img-no-kmods

 }

 # End /boot/grub2/grub.cfg

@@ -89,7 +89,7 @@ fi

 sgdisk -t1:ef02 $DISK_DEVICE >> $LOGFILE

 echo "Mapping device partition to loop device"

-kpartx -av $DISK_DEVICE >> $LOGFILE

+kpartx -avs $DISK_DEVICE >> $LOGFILE

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

@@ -36,7 +36,7 @@ mv $PHOTON_IMG_OUTPUT_PATH/temp/photon-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM

 cd $PHOTON_IMG_OUTPUT_PATH

 rm -rf photon-custom

 DISK_DEVICE=`losetup --show -f ${PHOTON_IMG_OUTPUT_PATH}/photon-ova.raw`

-kpartx -av $DISK_DEVICE

+kpartx -avs $DISK_DEVICE

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