@@ -49,6 +49,7 @@ endif

 TOOLS_BIN := $(SRCROOT)/tools/bin

 CONTAIN := $(TOOLS_BIN)/contain

+VIXDISKUTIL := $(TOOLS_BIN)/vixdiskutil

 .PHONY : all iso clean photon-build-machine photon-vagrant-build photon-vagrant-local cloud-image \

 check check-docker check-bison check-g++ check-gawk check-createrepo check-vagrant check-packer check-packer-ovf-plugin check-sanity \

@@ -430,13 +431,13 @@ photon-vagrant-local: check-packer check-vagrant

 		echo "Unable to find $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso ... aborting build"; \

 	fi

-cloud-image: $(PHOTON_STAGE) iso

+cloud-image: $(PHOTON_STAGE) $(VIXDISKUTIL) iso

 	@echo "Building cloud image $(IMG_NAME)..."

 	@cd $(PHOTON_CLOUD_IMAGE_BUILDER_DIR)

 	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) $(IMG_NAME) $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso $(ADDITIONAL_RPMS_PATH)

-cloud-image-all: $(PHOTON_STAGE) iso

+cloud-image-all: $(PHOTON_STAGE) $(VIXDISKUTIL) iso

 	@echo "Building cloud images - gce, ami, azure and ova..."

 	@cd $(PHOTON_CLOUD_IMAGE_BUILDER_DIR)

 	$(PHOTON_CLOUD_IMAGE_BUILDER) $(PHOTON_CLOUD_IMAGE_BUILDER_DIR) gce $(SRCROOT) $(PHOTON_GENERATED_DATA_DIR) $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso $(ADDITIONAL_RPMS_PATH)

@@ -509,3 +510,7 @@ $(CONTAIN): $(TOOLS_BIN)

 	gcc -O2 -std=gnu99 -Wall -Wextra $(SRCROOT)/tools/src/contain/*.c -o $@_unpriv

 	sudo install -o root -g root -m 4755 $@_unpriv $@

+$(VIXDISKUTIL): $(TOOLS_BIN)

+	@cd $(SRCROOT)/tools/src/vixDiskUtil && \

+	make

+

@@ -73,6 +73,10 @@ rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

 mkdir $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

 UUID_VALUE=$(blkid -s UUID -o value /dev/mapper/${DEVICE_NAME}p2)

+PARTUUID_VALUE=$(blkid -s PARTUUID -o value /dev/mapper/${DEVICE_NAME}p2)

+if [ -z "$PARTUUID_VALUE" ] ; then

+  PARTUUID_VALUE=$(sgdisk -i 2 $DISK_DEVICE | grep "Partition unique GUID" | cut -d ' ' -f 4)

+fi

 mkdir -p $ISO_MOUNT_FOLDER

 mount -o loop $PHOTON_ISO_PATH $ISO_MOUNT_FOLDER

@@ -87,6 +91,7 @@ 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 "UUID=$UUID_VALUE    /    ext4    defaults 1 1" >> $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/fstab

+sed -i "s/rootpartition=PARTUUID=$/rootpartition=PARTUUID=$PARTUUID_VALUE/" $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/boot/grub/grub.cfg

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

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

@@ -64,7 +64,7 @@ fi

 #

 #	Install grub2.

 #

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

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

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

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

 menuentry "Photon" {

 	insmod ext2

     insmod part_gpt

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

+	linux /boot/vmlinuz-4.4.8 init=/lib/systemd/systemd root=PARTUUID=UUID_PLACEHOLDER loglevel=3 ro

 	initrd /boot/initrd.img-no-kmods

 }

 # End /boot/grub2/grub.cfg

 EOF

-sed -i "s/UUID_PLACEHOLDER/$UUID/" "$BUILDROOT"/boot/grub2/grub.cfg > ${LOGFILE}	

+sed -i "s/UUID_PLACEHOLDER/$PARTUUID/" "$BUILDROOT"/boot/grub2/grub.cfg > ${LOGFILE}

 #Cleanup the workspace directory

 rm -rf "$BUILDROOT"/tools

@@ -13,10 +13,6 @@ sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-custom.vmdk|" vmx-template > /t

 cp ../update_custom_password.py $PHOTON_IMG_OUTPUT_PATH/

-cd $SRC_ROOT/tools/src/vixDiskUtil

-mkdir -p $SRC_ROOT/tools/bin

-make clean

-make

 $SRC_ROOT/tools/bin/vixdiskutil -convert $PHOTON_IMG_OUTPUT_PATH/photon-ova.raw -cap 16000 $PHOTON_IMG_OUTPUT_PATH/photon-ova.vmdk

 $SRC_ROOT/tools/bin/vixdiskutil -wmeta toolsVersion 2147483647 $PHOTON_IMG_OUTPUT_PATH/photon-ova.vmdk

@@ -13,10 +13,6 @@ sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-generic-custom.vmdk|" vmx-gener

 cp ../update_custom_password.py $PHOTON_IMG_OUTPUT_PATH/

-cd $SRC_ROOT/tools/src/vixDiskUtil

-mkdir -p $SRC_ROOT/tools/bin

-make clean

-make

 $SRC_ROOT/tools/bin/vixdiskutil -convert $PHOTON_IMG_OUTPUT_PATH/photon-ova_generic.raw -cap 16000 $PHOTON_IMG_OUTPUT_PATH/photon-generic-ova.vmdk

 $SRC_ROOT/tools/bin/vixdiskutil -wmeta toolsVersion 2147483647 $PHOTON_IMG_OUTPUT_PATH/photon-generic-ova.vmdk

@@ -9,11 +9,6 @@ sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-ova-ovs.vmdk|" vmx-ovs-template

 cp ../update_custom_password.py $PHOTON_IMG_OUTPUT_PATH/

-cd $SRC_ROOT/tools/src/vixDiskUtil

-mkdir -p $SRC_ROOT/tools/bin

-make clean

-make

-

 cd $PHOTON_IMG_OUTPUT_PATH

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

@@ -7,11 +7,6 @@ rm -f $PHOTON_IMG_OUTPUT_PATH/*.vmdk

 rm -f $PHOTON_IMG_OUTPUT_PATH/*.ova

 sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-ova-uefi.vmdk|" vmx-uefi-template > /tmp/vmx-temp-uefi.vmx

-cd $SRC_ROOT/tools/src/vixDiskUtil

-mkdir -p $SRC_ROOT/tools/bin

-make clean

-make

-

 cd $PHOTON_IMG_OUTPUT_PATH

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