@@ -135,7 +135,7 @@ packages-minimal: check $(PHOTON_STAGE) $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

                 -t ${THREADS}

 iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo

-	@echo "Building Photon FUll ISO..."

+	@echo "Building Photon Full ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

         sudo $(PHOTON_INSTALLER) -i $(PHOTON_STAGE)/photon.iso \

                 -w $(PHOTON_STAGE)/photon_iso \

@@ -358,13 +358,13 @@ photon-vagrant-local: check-packer check-vagrant

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

 	fi

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

+cloud-image: $(PHOTON_STAGE) 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) $(ADDITIONAL_RPMS_PATH)

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

+cloud-image-all: $(PHOTON_STAGE) 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) $(ADDITIONAL_RPMS_PATH)

@@ -287,7 +287,7 @@ class Installer(object):

             # remove the installer directory

             process = subprocess.Popen(['rm', '-rf', os.path.join(self.photon_root, "installer")], stdout=self.output)

             retval = process.wait()

-        else:

+        elif not self.install_config['vmdk_install']:

             #Build the initramfs by passing in the kernel version

             version_string = ''	

             for root, dirs, files in os.walk(self.rpm_path):

@@ -137,6 +137,7 @@ if __name__ == '__main__':

             parser.error("Incorrect arguments")

         config = {}

         config['iso_system'] = True

+        config['vmdk_install'] = False

     elif options.vmdk_path:

         # Check the arguments

@@ -164,6 +165,7 @@ if __name__ == '__main__':

         config = (JsonWrapper(args[0])).read()

         config['iso_system'] = False

+        config['vmdk_install'] = False

     if 'password' in config:

         # crypt the password if needed

@@ -18,6 +18,8 @@ GENERATED_DATA_PATH=$4

 PHOTON_STAGE_PATH=$5

 ADDITIONAL_RPMS_PATH=$6

 INSTALLER_PATH=$PHOTON_STAGE_PATH/$IMG_NAME

+PHOTON_ISO_PATH=$PHOTON_STAGE_PATH/photon.iso

+ISO_MOUNT_FOLDER=$PHOTON_STAGE_PATH/iso_mount

 PHOTON_IMG_OUTPUT_PATH=$PHOTON_STAGE_PATH/$IMG_NAME

@@ -69,6 +71,8 @@ echo "ROOT_PARTITION=/dev/mapper/${DEVICE_NAME}p2"

 rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

 mkdir $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

+mkdir -p $ISO_MOUNT_FOLDER

+mount -o loop $PHOTON_ISO_PATH $ISO_MOUNT_FOLDER

 mount -v -t ext4 /dev/mapper/${DEVICE_NAME}p2 $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

 rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/installer

 rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/LOGS

@@ -87,11 +91,22 @@ if [ -n "$ADDITIONAL_RPMS_PATH" ]

     mkdir $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/var/run

     cp -f $PHOTON_STAGE_PATH/RPMS/additonal/* $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/additional_rpms/

     chroot $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME} /bin/bash -c "rpm -i /additional_rpms/*"

+    rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/additional_rpms/

 fi

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

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

         cp ntpd.service $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

@@ -119,6 +134,8 @@ umount $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/dev/pts

 umount $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/dev

 umount $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/proc

 umount $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}

+umount $ISO_MOUNT_FOLDER

+rm -rf $ISO_MOUNT_FOLDER

 echo "Deleting device map partition"

 kpartx -d $DISK_DEVICE