new file mode 100644

@@ -0,0 +1,8 @@

+{

+    "minimal" : {

+        "title" : "Photon Minimal",

+        "file" : "packages_minimal.json",

+        "visible" : true,

+        "include" : []

+    }

+}

@@ -111,23 +111,25 @@ if [ $IMG_NAME != "ova" ] && [ $IMG_NAME != "ova_uefi" ]

       then

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

     fi

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

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

-    cp -f docker.socket $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

-    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

+    if [ $IMG_NAME != "ova_generic" ]

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

+        cp -f docker.service $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

+        cp -f docker.socket $PHOTON_IMG_OUTPUT_PATH/photon-${IMG_NAME}/lib/systemd/system/

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

-

+        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

+    fi

 fi

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

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

@@ -3,6 +3,9 @@ set -x

 PHOTON_IMG_OUTPUT_PATH=$1

 SRC_ROOT=$2

+rm -f $PHOTON_IMG_OUTPUT_PATH/*.vmdk

+rm -f $PHOTON_IMG_OUTPUT_PATH/*.ova

+

 #Generate two ova images one with a random password and the other with a defined password

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

new file mode 100755

@@ -0,0 +1,82 @@

+#!/bin/bash

+set -x

+PHOTON_IMG_OUTPUT_PATH=$1

+SRC_ROOT=$2

+

+rm -f $PHOTON_IMG_OUTPUT_PATH/*.vmdk

+rm -f $PHOTON_IMG_OUTPUT_PATH/*.ova

+

+#Generate two ova images one with a random password and the other with a defined password

+

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

+sed "s|VMDK_IMAGE|$PHOTON_IMG_OUTPUT_PATH/photon-generic-custom.vmdk|" vmx-generic-template > /tmp/vmx-generic-temp-custom.vmx

+

+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

+

+cd $PHOTON_IMG_OUTPUT_PATH

+

+mkdir -p $PHOTON_IMG_OUTPUT_PATH/temp

+ovftool /tmp/vmx-generic-temp.vmx $PHOTON_IMG_OUTPUT_PATH/temp/photon-generic-ova.ovf

+cd $PHOTON_IMG_OUTPUT_PATH/temp

+

+sed -i "s/otherGuest/other3xLinux64Guest/g" $PHOTON_IMG_OUTPUT_PATH/temp/photon-generic-ova.ovf

+#Add product info

+sed -i '/\/VirtualSystem>/i \ \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.0</Version> \n \t\t<FullVersion>1.0.0-TP2</FullVersion> \n \t</ProductSection> ' $PHOTON_IMG_OUTPUT_PATH/temp/photon-generic-ova.ovf

+rm -f $PHOTON_IMG_OUTPUT_PATH/temp/photon-generic-ova.mf

+openssl sha1 *.vmdk photon-generic-ova.ovf > photon-generic-ova.mf

+tar cf photon-generic-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-generic-ova.ovf photon-generic-ova.mf photon-generic-ova-disk1.vmdk

+cp $PHOTON_IMG_OUTPUT_PATH/temp/photon-generic-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova $PHOTON_IMG_OUTPUT_PATH/

+cd $PHOTON_IMG_OUTPUT_PATH

+ln -s photon-generic-ova-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-generic-ova.ova

+rm -rf photon-generic-custom

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

+kpartx -av $DISK_DEVICE

+

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

+

+rm -rf $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom

+mkdir $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom

+

+mount -v -t ext4 /dev/mapper/${DEVICE_NAME}p2 $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom

+#The defined password is 'changeme'

+cp $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom/etc/shadow $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom/etc/shadow.bak

+sed -e "s/^\(root:\)[^:]*:/\1x:/" $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom/etc/shadow.bak > $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom/etc/shadow

+./update_custom_password.py changeme $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom/etc/shadow-

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom/etc/shadow.bak

+# Force immediate password expiry

+chroot $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom /bin/bash -c "chage -d 0 root"

+umount $PHOTON_IMG_OUTPUT_PATH/photon-generic-custom

+kpartx -d $DISK_DEVICE

+

+rm -rf photon-generic-custom

+

+echo "Detaching loop device from raw disk"

+losetup -d $DISK_DEVICE

+

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

+

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

+

+mkdir -p $PHOTON_IMG_OUTPUT_PATH/temp1

+ovftool /tmp/vmx-generic-temp-custom.vmx $PHOTON_IMG_OUTPUT_PATH/temp1/photon-generic-custom.ovf

+cd $PHOTON_IMG_OUTPUT_PATH/temp1

+sed -i "s/otherGuest/other3xLinux64Guest/g" $PHOTON_IMG_OUTPUT_PATH/temp1/photon-generic-custom.ovf

+#Add product info

+sed -i '/\/VirtualSystem>/i \ \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.0</Version> \n \t\t<FullVersion>1.0.0-TP2</FullVersion> \n \t</ProductSection> ' $PHOTON_IMG_OUTPUT_PATH/temp1/photon-generic-custom.ovf

+rm -f $PHOTON_IMG_OUTPUT_PATH/temp1/photon-generic-custom.mf

+openssl sha1 *.vmdk photon-generic-custom.ovf > photon-generic-custom.mf

+tar cf photon-generic-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-generic-custom.ovf photon-generic-custom.mf photon-generic-custom-disk1.vmdk

+cp $PHOTON_IMG_OUTPUT_PATH/temp1/photon-generic-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova $PHOTON_IMG_OUTPUT_PATH/

+cd $PHOTON_IMG_OUTPUT_PATH

+ln -s photon-generic-custom-$PHOTON_RELEASE_VER-$PHOTON_BUILD_NUM.ova photon-generic-custom.ova

+rm -rf $PHOTON_IMG_OUTPUT_PATH/temp/

+rm -rf $PHOTON_IMG_OUTPUT_PATH/temp1/

+rm -f $PHOTON_IMG_OUTPUT_PATH/photon-ova_generic.raw

new file mode 100755

@@ -0,0 +1,32 @@

+#!/usr/bin/python2

+

+import os

+import crypt

+import random

+import string

+import sys

+import re

+

+

+def crypt_password(password, root_path):

+    shadow_password = crypt.crypt(password, "$6$" + "".join([random.choice(string.ascii_letters + string.digits) for _ in range(16)]))

+

+    shadow_filename = os.path.join(root_path, 'etc/shadow')

+    

+    if os.path.isfile(shadow_filename) == False:

+        with open(shadow_filename, "w") as destination:

+            destination.write("root:"+shadow_password+":")

+    else:

+        #add password hash in shadow file

+        with open(shadow_filename, "r") as source:

+            lines=source.readlines()

+

+        with open(shadow_filename, "w") as destination:

+            for line in lines:

+                destination.write(re.sub("root:x:",  "root:"+shadow_password+":",  line))

+

+if __name__ == '__main__':

+    if len(sys.argv) < 3:

+        print ("Usage : update_custom_password.py <password> <root_path>")

+        sys.exit(1)

+    crypt_password(str(sys.argv[1]), str(sys.argv[2]))

new file mode 100644

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

+{

+	"hostname": "photon-machine",

+	"password": 

+		{

+			"crypted": false,

+			"text": "PASSWORD"

+		},

+	"type": "minimal",

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

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

+}

+

new file mode 100644

@@ -0,0 +1,22 @@

+.encoding = "UTF-8"

+virtualHW.version = "10"

+scsi0.present = "TRUE"

+scsi0.virtualDev = "pvscsi"

+scsi0:0.present = "TRUE"

+scsi0:0.fileName = "VMDK_IMAGE"

+ethernet0.present = "TRUE"

+ethernet0.virtualDev = "vmxnet3"

+ethernet0.wakeOnPcktRcv = "FALSE"

+ethernet0.addressType = "generated"

+ethernet0.linkStatePropagation.enable = "TRUE"

+ethernet0.connectionType = "None"

+displayName = "Photon"

+guestOS = "*other26xLinux64Guest"

+memsize = "2048"

+ide1:0.present = "TRUE"

+ide1:0.autodetect = "TRUE"

+ide1:0.deviceType = "cdrom-raw"

+ide1:0.startConnected = "FALSE"

+

+

+