@@ -50,9 +50,10 @@ endif

 TOOLS_BIN := $(SRCROOT)/tools/bin

 CONTAIN := $(TOOLS_BIN)/contain

 VIXDISKUTIL := $(TOOLS_BIN)/vixdiskutil

+IMGCONVERTER := $(TOOLS_BIN)/imgconverter

 .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 \

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

 clean-install clean-chroot build-updated-packages

 THREADS?=1

@@ -431,13 +432,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) $(VIXDISKUTIL) iso

+cloud-image: check-kpartx $(PHOTON_STAGE) $(VIXDISKUTIL) $(IMGCONVERTER) 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) $(VIXDISKUTIL) iso

+cloud-image-all: check-kpartx $(PHOTON_STAGE) $(VIXDISKUTIL) $(IMGCONVERTER) 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)

@@ -466,6 +467,9 @@ check-gawk:

 check-createrepo:

 	@command -v createrepo >/dev/null 2>&1 || { echo "Package createrepo not installed. Aborting." >&2; exit 1; }

+check-kpartx:

+	@command -v kpartx >/dev/null 2>&1 || { echo "Package kpartx not installed. Aborting." >&2; exit 1; }

+

 check-vagrant: check-packer

 	@command -v $(VAGRANT) >/dev/null 2>&1 || { echo "Vagrant not installed or wrong path, expecting $(VAGRANT). Aborting" >&2; exit 1; }

@@ -514,3 +518,6 @@ $(VIXDISKUTIL): $(TOOLS_BIN)

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

 	make

+$(IMGCONVERTER): $(TOOLS_BIN)

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

+	make

@@ -8,8 +8,11 @@ cd /

 echo "127.0.0.1 localhost" >> /etc/hosts

 # Update /etc/resolv.conf

-rm /etc/resolv.conf

-echo "nameserver 172.31.0.2" >> /etc/resolv.conf

+if [ -f /etc/resolv.conf ]

+	then

+		rm /etc/resolv.conf

+fi

+echo "nameserver 169.254.169.253" >> /etc/resolv.conf

 echo "search ec2.internal" >> /etc/resolv.conf

@@ -54,11 +57,14 @@ echo "Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,

 echo "Tunnel no" >> /etc/ssh/ssh_config

 echo "ServerAliveInterval 420" >> /etc/ssh/ssh_config

-sed -i '/.*linux.*vmlinuz/ s/$/ console=ttyS0/' /boot/grub/grub.cfg

+sed -i 's/net.ifnames=0//' /boot/grub/grub.cfg

+sed -i 's/$photon_cmdline/init=\/lib\/systemd\/systemd loglevel=3 ro console=ttyS0 earlyprintk=ttyS0/' /boot/grub/grub.cfg

 # Disable loading/unloading of modules

 echo 1 > /proc/sys/kernel/modules_disabled

 # Remove kernel symbols

-rm /boot/system.map*

-

+if [ -f /boot/system.map* ]

+	then

+		rm /boot/system.map*

+fi

\ No newline at end of file

deleted file mode 100755

@@ -1,9 +0,0 @@

-#!/bin/bash

-

-PHOTON_IMG_OUTPUT_PATH=$1

-

-cd $PHOTON_IMG_OUTPUT_PATH

-mv photon-ami.raw photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.raw

-tar -Szcf photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.tar.gz photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.raw

-

-rm -f photon-ami-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.raw

@@ -1,12 +1,18 @@

 {

-	"hostname": "photon-machine",

-	"password": 

-		{

-			"crypted": false,

-			"text": "PASSWORD"

-		},

-	"type": "ami",

+    "hostname": "photon-machine",

+    "password": 

+        {

+            "crypted": false,

+            "text": "PASSWORD"

+        },

+    "type": "ami",

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

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

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

+    "postinstallscripts": [ "ami-patch.sh", "../password-expiry.sh" ],

+    "additionalfiles": [

+                            {"cloud-photon.cfg": "/etc/cloud/cloud.cfg"}

+                       ],

+    "artifacttype": "tgz",

+    "keeprawdisk": "false"

 }

@@ -48,7 +48,8 @@ echo "Ciphers aes128-ctr,aes192-ctr,aes256-ctr,arcfour256,arcfour128,aes128-cbc,

 echo "Tunnel no" >> /etc/ssh/ssh_config

 echo "ServerAliveInterval 180" >> /etc/ssh/ssh_config

-sed -i '/.*linux.*vmlinuz/ s/$/ console=ttyS0 earlyprintk=ttyS0 rootdelay=30/' /boot/grub/grub.cfg

+sed -i 's/net.ifnames=0//' /boot/grub/grub.cfg

+sed -i 's/$photon_cmdline/init=\/lib\/systemd\/systemd loglevel=3 ro console=ttyS0 earlyprintk=ttyS0 rootdelay=30/' /boot/grub/grub.cfg

 # Disable loading/unloading of modules

 echo 1 > /proc/sys/kernel/modules_disabled

deleted file mode 100755

@@ -1,12 +0,0 @@

-#!/bin/bash

-

-PHOTON_IMG_OUTPUT_PATH=$1

-SRC_ROOT=$2

-cd $SRC_ROOT/tools/src/imgconverter

-mkdir -p $SRC_ROOT/tools/bin

-make clean

-make

-$SRC_ROOT/tools/bin/imgconverter -i $PHOTON_IMG_OUTPUT_PATH/photon-azure.raw -v vhd -o $PHOTON_IMG_OUTPUT_PATH/photon-azure-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.vhd

-

-rm -f $PHOTON_IMG_OUTPUT_PATH/photon-azure.raw

-

@@ -1,12 +1,18 @@

 {

-	"hostname": "photon-machine",

-	"password": 

-		{

-			"crypted": false,

-			"text": "PASSWORD"

-		},

-	"type": "azure",

-    "size": {"root": "8", "swap": "0"},

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

+    "hostname": "photon-machine",

+    "password": 

+        {

+            "crypted": false,

+            "text": "PASSWORD"

+        },

+    "type": "azure",

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

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

+    "postinstallscripts": [ "azure-patch.sh", "../password-expiry.sh" ],

+    "additionalfiles": [

+                            {"cloud-photon.cfg": "/etc/cloud/cloud.cfg"}

+                       ],

+    "artifacttype": "vhd",

+    "keeprawdisk": "false"

 }

@@ -18,25 +18,31 @@ GENERATED_DATA_PATH=$4

 PHOTON_ISO_PATH=$5

 PHOTON_STAGE_PATH=${PHOTON_ISO_PATH%/*}

 ADDITIONAL_RPMS_PATH=$6

-INSTALLER_PATH=$PHOTON_STAGE_PATH/$IMG_NAME

-ISO_MOUNT_FOLDER=$PHOTON_STAGE_PATH/iso_mount

+WORKING_DIR=$PHOTON_STAGE_PATH/$IMG_NAME

 PHOTON_IMG_OUTPUT_PATH=$PHOTON_STAGE_PATH/$IMG_NAME

 VMDK_CONFIG_FILE=${BUILD_SCRIPTS_PATH}/$IMG_NAME/vmdk_$IMG_NAME.json

 VMDK_CONFIG_SAFE_FILE=${BUILD_SCRIPTS_PATH}/$IMG_NAME/vmdk_safe_$IMG_NAME.json

-mkdir -p $INSTALLER_PATH/installer

-cp -R $SRC_ROOT/installer $INSTALLER_PATH/

+cd $BUILD_SCRIPTS_PATH

+image_list=`for i in $(ls -d */); do echo ${i%%/}; done`

+if ! [[ $image_list =~ (^|[[:space:]])$IMG_NAME($|[[:space:]]) ]]

+  then

+    echo "Input image name not supported. Aborting."; exit 1;

+fi

-cd $INSTALLER_PATH/installer

+rm -rf $WORKING_DIR

+mkdir -p $WORKING_DIR/installer

+cp -R $SRC_ROOT/installer $WORKING_DIR/

+

+cd $WORKING_DIR/installer

 cp $VMDK_CONFIG_FILE $VMDK_CONFIG_SAFE_FILE

 cp ${BUILD_SCRIPTS_PATH}/mk-setup-vmdk.sh .

 cp ${BUILD_SCRIPTS_PATH}/mk-clean-vmdk.sh .

-

-if [[ $IMG_NAME != ova* ]]

+if [[ $IMG_NAME == ova* ]]

   then

-    cp ${BUILD_SCRIPTS_PATH}/mk-setup-grub.sh .

+    command -v ovftool >/dev/null 2>&1 || { echo "Ovftool not installed. Aborting." >&2; exit 1; }

 fi

 if [ -e ${BUILD_SCRIPTS_PATH}/${IMG_NAME}/mk-setup-grub.sh ]

@@ -49,105 +55,26 @@ sed -i "s/PASSWORD/$PASSWORD/" $VMDK_CONFIG_SAFE_FILE

 if [ -n "$ADDITIONAL_RPMS_PATH" ]

   then

-    mkdir $PHOTON_STAGE_PATH/RPMS/additonal

-    cp -f $ADDITIONAL_RPMS_PATH/* $PHOTON_STAGE_PATH/RPMS/additonal/

+    mkdir $PHOTON_STAGE_PATH/RPMS/additional

+    cp -f $ADDITIONAL_RPMS_PATH/* $PHOTON_STAGE_PATH/RPMS/additional/

 fi

-./photonInstaller.py -p $GENERATED_DATA_PATH/build_install_options_$IMG_NAME.json -r $PHOTON_STAGE_PATH/RPMS -v $INSTALLER_PATH/photon-${IMG_NAME} -o $GENERATED_DATA_PATH -f $VMDK_CONFIG_SAFE_FILE

+./photonInstaller.py -p $GENERATED_DATA_PATH/build_install_options_$IMG_NAME.json -r $PHOTON_STAGE_PATH/RPMS -v $WORKING_DIR/photon-${IMG_NAME} -o $GENERATED_DATA_PATH -f $VMDK_CONFIG_SAFE_FILE

 cat $VMDK_CONFIG_SAFE_FILE

 rm $VMDK_CONFIG_SAFE_FILE

 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

-

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

-

-echo "DISK_DEVICE=$DISK_DEVICE"

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

-

-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

-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

-cp $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow.bak

-sed -e "s/^\(root:\)[^:]*:/\1*:/" $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow.bak > $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/shadow

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

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

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

-if [ -n "$ADDITIONAL_RPMS_PATH" ]

-  then

-    mkdir $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/additional_rpms

-    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" ] && [ $IMG_NAME != "ova_ovs" ]

-  then

-    cd $BUILD_SCRIPTS_PATH

-    if [ $IMG_NAME = "gce" ]

-      then

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

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

-    fi

-    if [ $IMG_NAME != "ova_generic" ]

-      then

-        if [ -e $IMG_NAME/cloud-photon.cfg ]

-          then

-            cp -f $IMG_NAME/cloud-photon.cfg $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/cloud/cloud.cfg

-        fi

-        cp $IMG_NAME/$IMG_NAME-patch.sh $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/

-        cp /etc/resolv.conf $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/

-        echo "chrooting and running patch inside the chroot"

-        chroot $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME} /bin/bash -c "/$IMG_NAME-patch.sh"

-        rm -f $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/$IMG_NAME-patch.sh

-        # Change the max password days to 99999

-        chroot $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME} /bin/bash -c "cat /etc/shadow | cut -d: -f1 | xargs -I {} chage -I -1 -m 0 -M 99999 -E -1 -W 7 {}"

-        sed -i 's/^PASS_MAX_DAYS.*/PASS_MAX_DAYS   99999/' $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/etc/login.defs

-    fi

-fi

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

-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

-

-rm -rf photon-${IMG_NAME}

-

-echo "Detaching loop device from raw disk"

-losetup -d $DISK_DEVICE

-

-

-cd $IMG_NAME

-./mk-$IMG_NAME-image.sh $PHOTON_STAGE_PATH/$IMG_NAME $SRC_ROOT

+./customize_cloud_image.py \

+ -r ${PHOTON_IMG_OUTPUT_PATH}/photon-${IMG_NAME}.raw \

+ -c $VMDK_CONFIG_FILE \

+ -w $WORKING_DIR \

+ -m $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME} \

+ -a $PHOTON_STAGE_PATH/RPMS/additional \

+ -i $IMG_NAME \

+ -t $SRC_ROOT/tools/bin/ \

+ -b $BUILD_SCRIPTS_PATH

+

+rm -rf $WORKING_DIR/installer

 exit 0

new file mode 100755

@@ -0,0 +1,262 @@

+#!/usr/bin/python2

+

+import os

+import re

+import shutil

+import tarfile

+import fileinput

+from optparse import OptionParser

+from utils import Utils

+

+def create_ova_image(raw_image_name, tools_path, build_scripts_path, config):

+    output_path = os.path.dirname(os.path.realpath(raw_image_name))

+    utils = Utils()

+    # Remove older artifacts

+    files = os.listdir(output_path)    

+    for file in files:

+        if file.endswith(".vmdk"):

+            os.remove(os.path.join(output_path, file))

+

+    vmx_path = output_path + '/photon-ova.vmx'

+    utils.replaceandsaveasnewfile(build_scripts_path + '/vmx-template', vmx_path, 'VMDK_IMAGE', output_path + '/photon-ova.vmdk')

+    vixdiskutil_path = tools_path + 'vixdiskutil'

+    vmdk_path = output_path + '/photon-ova.vmdk'

+    ovf_path = output_path + '/photon-ova.ovf'

+    mf_path = output_path + '/photon-ova.mf'

+    utils.runshellcommand("{} -convert {} -cap 16000 {}".format(vixdiskutil_path, raw_image_name, vmdk_path))

+    utils.runshellcommand("{} -wmeta toolsVersion 2147483647 {}".format(vixdiskutil_path, vmdk_path))

+

+    utils.runshellcommand("ovftool {} {}".format(vmx_path, ovf_path))

+    utils.replaceinfile(ovf_path, 'otherGuest', 'other3xLinux64Guest')

+

+    #Add product info

+    for line in fileinput.input(ovf_path, inplace=True):

+        if line.strip() == '</VirtualSystem>':

+            print ' \t<ProductSection> \n \t\t<Info>Information about the installed software</Info> \n \t\t<Product>Photon</Product> \n \t\t<Vendor>VMware Inc.</Vendor> \n \t\t<Version>1.0</Version> \n \t\t<FullVersion>1.0</FullVersion> \n \t</ProductSection> '

+        print line,

+

+    if os.path.exists(mf_path):

+        os.remove(mf_path)

+

+    cwd = os.getcwd()

+    os.chdir(output_path)

+    out = utils.runshellcommand("openssl sha1 photon-ova-disk1.vmdk photon-ova.ovf")

+    with open(mf_path, "w") as source:

+        source.write(out)

+    rawsplit = os.path.splitext(raw_image_name)

+    ova_name = rawsplit[0] + '.ova'

+

+    ovatar = tarfile.open(ova_name, "w", format = tarfile.USTAR_FORMAT)

+    for name in ["photon-ova.ovf", "photon-ova.mf", "photon-ova-disk1.vmdk"]:

+        ovatar.add(name, arcname=os.path.basename(name))

+    ovatar.close()

+    os.remove(vmx_path)    

+    os.remove(mf_path)

+

+    if 'additionalhwversion' in config:

+        for addlversion in config['additionalhwversion']:

+            new_ovf_path = output_path + "/photon-ova-hw{}.ovf".format(addlversion)

+            mf_path = output_path + "/photon-ova-hw{}.mf".format(addlversion)

+            utils.replaceandsaveasnewfile(ovf_path, new_ovf_path, "vmx-.*<", "vmx-{}<".format(addlversion)) 

+            out = utils.runshellcommand("openssl sha1 photon-ova-disk1.vmdk photon-ova-hw{}.ovf".format(addlversion))

+            with open(mf_path, "w") as source:

+                source.write(out)

+            temp_name_list = os.path.basename(ova_name).split('-')

+            temp_name_list = temp_name_list[:2] + ["hw{}".format(addlversion)] + temp_name_list[2:]

+            new_ova_name = '-'.join(temp_name_list)

+            new_ova_path = output_path + '/' + new_ova_name

+            ovatar = tarfile.open(new_ova_path, "w", format = tarfile.USTAR_FORMAT)

+            for name in [new_ovf_path, mf_path, "photon-ova-disk1.vmdk"]:

+                ovatar.add(name, arcname=os.path.basename(name))

+            ovatar.close()

+

+            os.remove(new_ovf_path)

+            os.remove(mf_path)

+    os.chdir(cwd)    

+    os.remove(ovf_path)

+    os.remove(vmdk_path)

+    files = os.listdir(output_path)    

+    for file in files:

+        if file.endswith(".vmdk"):

+            os.remove(os.path.join(output_path, file))    

+

+

+if __name__ == '__main__':

+    usage = "Usage: %prog [options]"

+    parser = OptionParser(usage)

+

+    parser.add_option("-r", "--raw-image-path",  dest="raw_image_path")

+    parser.add_option("-c", "--vmdk-config-path", dest="vmdk_config_path")

+    parser.add_option("-w",  "--working-directory",  dest="working_directory")

+    parser.add_option("-m",  "--mount-path",  dest="mount_path")

+    parser.add_option("-a",  "--additional-rpms-path",  dest="additional_rpms_path")

+    parser.add_option("-i",  "--image-name",  dest="image_name")

+    parser.add_option("-t",  "--tools-bin-path",  dest="tools_bin_path")

+    parser.add_option("-b",  "--build-scripts-path",  dest="build_scripts_path")

+

+    (options,  args) = parser.parse_args()

+    utils = Utils()

+    config = utils.jsonread(options.vmdk_config_path)

+    print options

+

+    disk_device = (utils.runshellcommand("losetup --show -f {}".format(options.raw_image_path))).rstrip('\n')

+    disk_partitions = utils.runshellcommand("kpartx -as {}".format(disk_device))

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

+

+    if not os.path.exists(options.mount_path):

+        os.mkdir(options.mount_path)

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

+

+    try:

+        print "Generating PARTUUID for the loop device ..."

+        partuuidval = (utils.runshellcommand("blkid -s PARTUUID -o value {}".format(loop_device_path))).rstrip('\n')

+        uuidval = (utils.runshellcommand("blkid -s UUID -o value {}".format(loop_device_path))).rstrip('\n')

+        if (partuuidval == ''):

+            sgdiskout = utils.runshellcommand("sgdisk -i 2 {} ".format(disk_device))

+            partuuidval = (re.findall(r'Partition unique GUID.*', sgdiskout))[0].split(':')[1].strip(' ').lower()

+

+        if (partuuidval == ''):

+            raise RuntimeError("Cannot generate partuuid")

+

+        # Mount the loop device

+        print "Mounting the loop device for customization ..."

+        utils.runshellcommand("mount -t ext4 {} {}".format(loop_device_path, options.mount_path))

+        shutil.rmtree(options.mount_path + "/installer", ignore_errors=True)

+        shutil.rmtree(options.mount_path + "/LOGS", ignore_errors=True)

+        # Clear the root password if not set explicitly from the config file

+        if (config['password']['text'] != 'PASSWORD'):

+            utils.replaceinfile(options.mount_path + "/etc/shadow",'root:.*?:','root:*:')

+        # Clear machine-id so it gets regenerated on boot

+        open(options.mount_path + "/etc/machine-id", "w").close()

+        os.remove(options.mount_path + "/etc/fstab")

+

+        f = open(options.mount_path + "/etc/fstab", "w")

+        if (uuidval != ''):

+            f.write("UUID={}    /    ext4    defaults 1 1\n".format(uuidval))

+        else:

+            f.write("PARTUUID={}    /    ext4    defaults 1 1\n".format(partuuidval))

+        f.close()

+        utils.replaceinfile(options.mount_path + "/boot/grub/grub.cfg", "rootpartition=PARTUUID=.*$", "rootpartition=PARTUUID={}".format(partuuidval))

+

+        if os.path.exists(options.additional_rpms_path):

+            print "Installing additional rpms"

+            os.mkdir(options.mount_path + "/additional_rpms")

+            os.mkdir(options.mount_path + "/var/run")

+            utils.copyallfiles(additional_rpms_path, options.mount_path + "/additional_rpms")

+            utils.runshellcommand("chroot {} /bin/bash -c 'rpm -i /additional_rpms/*'".format(options.mount_path))

+            shutil.rmtree(options.mount_path + "/additional_rpms", ignore_errors=True)

+            shutil.rmtree(additional_rpms_path, ignore_errors=True)

+

+        utils.runshellcommand("mount -o bind /proc {}".format(options.mount_path + "/proc"))

+        utils.runshellcommand("mount -o bind /dev {}".format(options.mount_path + "/dev"))

+        utils.runshellcommand("mount -o bind /dev/pts {}".format(options.mount_path + "/dev/pts"))

+        utils.runshellcommand("mount -o bind /sys {}".format(options.mount_path + "/sys"))

+

+        if 'additionalfiles' in config:

+            print "  Copying additional files into the raw image ..."

+            for filetuples in config['additionalfiles']:

+                for src,dest in filetuples.iteritems():

+                    shutil.copyfile(options.build_scripts_path + '/' + options.image_name + '/' + src, options.mount_path + '/' + dest)

+

+

+        if 'postinstallscripts' in config:

+            print "  Running post install scripts ..."

+            if not os.path.exists(options.mount_path + "/tempscripts"):

+                os.mkdir(options.mount_path + "/tempscripts")

+            for script in config['postinstallscripts']:

+                shutil.copy(options.build_scripts_path + '/' + options.image_name + '/' + script, options.mount_path + "/tempscripts")

+            for script in os.listdir(options.mount_path + "/tempscripts"):

+                print "     ...running script {}".format(script)

+                utils.runshellcommand("chroot {} /bin/bash -c '/tempscripts/{}'".format(options.mount_path, script))

+            shutil.rmtree(options.mount_path + "/tempscripts", ignore_errors=True)

+

+        utils.runshellcommand("umount -l {}".format(options.mount_path + "/sys"))

+        utils.runshellcommand("umount -l {}".format(options.mount_path + "/dev/pts"))

+        utils.runshellcommand("umount -l {}".format(options.mount_path + "/dev"))

+        utils.runshellcommand("umount -l {}".format(options.mount_path + "/proc"))

+        utils.runshellcommand("umount -l {}".format(options.mount_path))

+

+        mount_out = utils.runshellcommand("mount")

+        print "List of mounted devices:"

+        print mount_out

+

+    finally:

+        utils.runshellcommand("kpartx -d {}".format(disk_device))

+        utils.runshellcommand("losetup -d {}".format(disk_device))

+

+        shutil.rmtree(options.mount_path)

+

+        photon_release_ver = os.environ['PHOTON_RELEASE_VER']

+        photon_build_num = os.environ['PHOTON_BUILD_NUM']

+        raw_image = options.raw_image_path

+        new_name = ""

+        img_path = os.path.dirname(os.path.realpath(raw_image))

+        # Rename gce image to disk.raw

+        if options.image_name == "gce":

+            print "Renaming the raw file to disk.raw ..."

+            new_name = img_path + '/disk.raw'

+

+        else:

+            new_name = img_path + '/photon-' + options.image_name + '-' + photon_release_ver + '-' + photon_build_num + '.raw'

+

+        shutil.move(raw_image, new_name)

+        raw_image = new_name

+

+        if config['artifacttype'] == 'tgz':

+            print "Generating the tar.gz artifact ..."

+            tarname = img_path + '/photon-' + options.image_name + '-' + photon_release_ver + '-' + photon_build_num + '.tar.gz'

+            tgzout = tarfile.open(tarname, "w:gz")

+            tgzout.add(raw_image, arcname=os.path.basename(raw_image))

+            tgzout.close()

+        elif config['artifacttype'] == 'vhd':

+            imgconverter = options.tools_bin_path + '/imgconverter'

+            vhdname = img_path + '/photon-' + options.image_name + '-' + photon_release_ver + '-' + photon_build_num + '.vhd'

+            print "Converting raw disk to vhd ..."

+            utils.runshellcommand("{} -i {} -v vhd -o {}".format(imgconverter, raw_image, vhdname))

+        elif config['artifacttype'] == 'ova':

+            create_ova_image(raw_image, options.tools_bin_path, options.build_scripts_path + '/' + options.image_name, config)

+            if 'customartifacts' in config:

+                if 'postinstallscripts' in config['customartifacts']:

+                    custom_path = img_path + '/photon-custom'

+                    if not os.path.exists(custom_path):

+                        os.mkdir(custom_path)

+                    index = 1

+                    for script in config['customartifacts']['postinstallscripts']:

+                        print "Creating custom ova {}...".format(index)

+                        if index > 1:

+                            raw_image_custom = img_path + "/photon-custom-{}".format(index) + photon_release_ver + '-' + photon_build_num + '.raw'

+                        else:

+                            raw_image_custom = img_path + "/photon-custom-" + photon_release_ver + '-' + photon_build_num + '.raw'

+                        shutil.move(raw_image, raw_image_custom)

+                        disk_device = (utils.runshellcommand("losetup --show -f {}".format(raw_image_custom))).rstrip('\n')

+                        disk_partitions = utils.runshellcommand("kpartx -as {}".format(disk_device))

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

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

+

+                        print "Mounting the loop device for ova customization ..."

+                        utils.runshellcommand("mount -t ext4 {} {}".format(loop_device_path, custom_path))

+                        if not os.path.exists(custom_path + "/tempscripts"):

+                            os.mkdir(custom_path + "/tempscripts")

+                        shutil.copy(options.build_scripts_path + '/' + options.image_name + '/' + script, custom_path + "/tempscripts")

+                        print "Running custom ova script {}".format(script)

+                        utils.runshellcommand("chroot {} /bin/bash -c '/tempscripts/{}'".format(custom_path, script))

+                        shutil.rmtree(custom_path + "/tempscripts", ignore_errors=True)

+                        utils.runshellcommand("umount -l {}".format(custom_path))

+

+                        mount_out = utils.runshellcommand("mount")

+                        print "List of mounted devices:"

+                        print mount_out

+

+                        utils.runshellcommand("kpartx -d {}".format(disk_device))

+                        utils.runshellcommand("losetup -d {}".format(disk_device))

+                        create_ova_image(raw_image_custom, options.tools_bin_path, options.build_scripts_path + '/' + options.image_name, config)

+                        raw_image = raw_image_custom

+                        index = index + 1

+

+                    shutil.rmtree(custom_path)                 

+

+        else:

+            raise ValueError("Unknown output format")

+

+        if config['keeprawdisk'] == 'false':

+            os.remove(raw_image)

deleted file mode 100644

@@ -1,9 +0,0 @@

-[Unit]

-Description=etcd service

-

-[Service]

-ExecStart=/usr/sbin/etcd

-Restart=always

-

-[Install]

-WantedBy=multi-user.target

deleted file mode 100644

@@ -1,11 +0,0 @@

-[Unit]

-Description=Network interface initialization

-After=local-fs.target network-online.target network.target

-Wants=local-fs.target network-online.target network.target

-

-[Service]

-ExecStart=/usr/sbin/ifconfig eth0 mtu 1460 up

-Type=oneshot

-

-[Install]

-WantedBy=multi-user.target

new file mode 100644

@@ -0,0 +1,11 @@

+[Unit]

+Description=Network interface initialization

+After=local-fs.target network-online.target network.target

+Wants=local-fs.target network-online.target network.target

+

+[Service]

+ExecStart=/usr/sbin/ifconfig eth0 mtu 1460 up

+Type=oneshot

+

+[Install]

+WantedBy=multi-user.target

deleted file mode 100755

@@ -1,12 +0,0 @@

-#!/bin/bash

-

-PHOTON_IMG_OUTPUT_PATH=$1

-RAWFILE="photon-gce.raw"

-TARFILE="photon-gce-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.tar.gz"

-

-echo "Creating ${TARFILE} file from ${RAWFILE}."

-cd $PHOTON_IMG_OUTPUT_PATH

-mv ${RAWFILE} disk.raw

-tar -Szcf $PHOTON_IMG_OUTPUT_PATH/${TARFILE} disk.raw

-

-rm -f disk.raw

@@ -63,7 +63,8 @@ fi

 #

 #	Install grub2.

 #

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

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

+PARTUUID_VAL=$(blkid -s PARTUUID -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"

@@ -93,7 +94,7 @@ if [ "$BOOTMODE" == "efi" ]; then

     grub_efi_install

 fi

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

+cat > ${BUILDROOT}/boot/grub2/grub.cfg <<EOF

 # Begin /boot/grub2/grub.cfg

 #

 # DO NOT EDIT THIS FILE

@@ -103,21 +104,23 @@ cat > "$BUILDROOT"/boot/grub2/grub.cfg << "EOF"

 #

 ### BEGIN /etc/grub.d/00_header ###

-if [ -s $prefix/grubenv ]; then

+if [ -s \$prefix/grubenv ]; then

   load_env

 fi

 set default="0"

-if [ x"${feature_menuentry_id}" = xy ]; then

+if [ x"\${feature_menuentry_id}" = xy ]; then

   menuentry_id_option="--id"

 else

   menuentry_id_option=""

 fi

 export menuentry_id_option

+load_env -f "$BOOT_DIRECTORY"photon.cfg

+set rootpartition=PARTUUID=$PARTUUID_VAL

-if [ "${prev_saved_entry}" ]; then

-  set saved_entry="${prev_saved_entry}"

+if [ "\${prev_saved_entry}" ]; then

+  set saved_entry="\${prev_saved_entry}"

   save_env saved_entry

   set prev_saved_entry=

   save_env prev_saved_entry

@@ -125,14 +128,14 @@ if [ "${prev_saved_entry}" ]; then

 fi

 function savedefault {

-  if [ -z "${boot_once}" ]; then

-    saved_entry="${chosen}"

+  if [ -z "\${boot_once}" ]; then

+    saved_entry="\${chosen}"

     save_env saved_entry

   fi

 }

 function load_video {

-  if [ x$feature_all_video_module = xy ]; then

+  if [ x\$feature_all_video_module = xy ]; then

     insmod all_video

   else

     insmod efi_gop

@@ -152,51 +155,51 @@ set timeout=5

 ### END /etc/grub.d/00_header ###

 ### BEGIN /etc/grub.d/10_linux ###

-menuentry 'GNU/Linux' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-simple-UUID_PLACEHOLDER' {

+menuentry 'GNU/Linux' --class gnu-linux --class gnu --class os \$menuentry_id_option 'gnulinux-simple-UUID_PLACEHOLDER' {

     load_video

     set gfxpayload=keep

     insmod gzio

     insmod part_msdos

     insmod ext2

     set root='hd0,msdos2'

-    if [ x$feature_platform_search_hint = xy ]; then

+    if [ x\$feature_platform_search_hint = xy ]; then

       search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos2 --hint-efi=hd0,msdos2 --hint-baremetal=ahci0,msdos2  UUID_PLACEHOLDER

     else

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

     fi

-    echo    'Loading Linux 4.4.8 ...'

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

+    echo    'Loading Linux \$photon_linux ...'

+    linux   "$BOOT_DIRECTORY"\$photon_linux 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.4.8' --class gnu-linux --class gnu --class os $menuentry_id_option 'gnulinux-4.4.8-advanced-UUID_PLACEHOLDER' {

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

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

         load_video

         set gfxpayload=keep

         insmod gzio

         insmod part_msdos

         insmod ext2

         set root='hd0,msdos2'

-        if [ x$feature_platform_search_hint = xy ]; then

+        if [ x\$feature_platform_search_hint = xy ]; then

           search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos2 --hint-efi=hd0,msdos2 --hint-baremetal=ahci0,msdos2  UUID_PLACEHOLDER

         else

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

         fi

-        echo    'Loading Linux 4.4.8 ...'

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

+        echo    'Loading Linux \$photon_linux ...'

+        linux   "$BOOT_DIRECTORY"\$photon_linux root=/dev/sda2 ro console=ttyS0,38400n8 

     }

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

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

         load_video

         set gfxpayload=keep

         insmod gzio

         insmod part_msdos

         insmod ext2

         set root='hd0,msdos2'

-        if [ x$feature_platform_search_hint = xy ]; then

+        if [ x\$feature_platform_search_hint = xy ]; then

           search --no-floppy --fs-uuid --set=root --hint-bios=hd0,msdos2 --hint-efi=hd0,msdos2 --hint-baremetal=ahci0,msdos2  UUID_PLACEHOLDER

         else

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

         fi

-        echo    'Loading Linux 4.4.8 ...'

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

+        echo    'Loading Linux \$photon_linux ...'

+        linux   "$BOOT_DIRECTORY"\$photon_linux root=/dev/sda2 ro single console=ttyS0,38400n8

     }

 }

@@ -216,17 +219,17 @@ submenu 'Advanced options for GNU/Linux' $menuentry_id_option 'gnulinux-advanced

 ### END /etc/grub.d/40_custom ###

 ### BEGIN /etc/grub.d/41_custom ###

-if [ -f  ${config_directory}/custom.cfg ]; then

-  source ${config_directory}/custom.cfg

-elif [ -z "${config_directory}" -a -f  $prefix/custom.cfg ]; then

-  source $prefix/custom.cfg;

+if [ -f  \${config_directory}/custom.cfg ]; then

+  source \${config_directory}/custom.cfg

+elif [ -z "\${config_directory}" -a -f  \$prefix/custom.cfg ]; then

+  source \$prefix/custom.cfg;

 fi

 ### END /etc/grub.d/41_custom ###

 # End /boot/grub2/grub.cfg

 EOF

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

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

 #Cleanup the workspace directory

 #find "$BUILDROOT"/{,usr/}{lib,bin,sbin} -type f -exec strip --strip-debug --strip-unneeded '{}' ';' > /dev/null 2>&1

new file mode 100644

@@ -0,0 +1,12 @@

+[Unit]

+Description=Network Time Service

+After=network.target nss-lookup.target

+

+[Service]

+Type=forking

+PrivateTmp=true

+ExecStart=/usr/bin/ntpd -g -u ntp:ntp

+Restart=always

+

+[Install]

+WantedBy=multi-user.target

@@ -1,12 +1,20 @@

 {

-	"hostname": "photon-machine",

-	"password": 

-		{

-			"crypted": false,

-			"text": "PASSWORD"

-		},

-	"type": "gce",

-    "size": {"root": "8", "swap": "0"},

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

+    "hostname": "photon-machine",

+    "password": 

+        {

+            "crypted": false,

+            "text": "PASSWORD"

+        },

+    "type": "gce",

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

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

+    "postinstallscripts": [ "gce-patch.sh", "../password-expiry.sh" ],

+    "additionalfiles": [

+                            {"cloud-photon.cfg": "/etc/cloud/cloud.cfg"},

+                            {"ntpd.service": "/usr/lib/systemd/system/ntpd.service"},

+                            {"eth0.service": "/usr/lib/systemd/system/eth0.service"}

+                       ],

+    "artifacttype": "tgz",

+    "keeprawdisk": "false"

 }

deleted file mode 100755

@@ -1,127 +0,0 @@

-#!/bin/bash

-#################################################

-#       Title:  mk-setup-grub                   #