@@ -39,7 +39,7 @@ TOOLS_BIN := $(SRCROOT)/tools/bin

 CONTAIN := $(TOOLS_BIN)/contain

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

-check 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-vagrant check-packer check-packer-ovf-plugin check-sanity \

 clean-install clean-chroot

 THREADS?=1

@@ -97,6 +97,17 @@ ostree-host-iso: check $(PHOTON_STAGE) ostree-repo

                 -f > \

                 $(PHOTON_LOGS_DIR)/installer.log 2>&1

+live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

+	@echo "Building Photon Minimal LIVE ISO..."

+	@cd $(PHOTON_INSTALLER_DIR) && \

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

+                -w $(PHOTON_STAGE)/photon_iso \

+                -l $(PHOTON_STAGE)/LOGS \

+                -r $(PHOTON_STAGE)/RPMS \

+                -p $(PHOTON_DATA_DIR)/build_install_options_livecd.json \

+                -f > \

+                $(PHOTON_LOGS_DIR)/installer.log 2>&1                

+

 packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

 	@echo "Building all RPMS..."

 	@cd $(PHOTON_PKG_BUILDER_DIR) && \

@@ -111,7 +122,7 @@ packages-minimal: check $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES)

 		-c $(PHOTON_BINTRAY_CONFIG) \

                 -t ${THREADS}

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

+iso: 

 	@echo "Building Photon FUll ISO..."

 	@cd $(PHOTON_INSTALLER_DIR) && \

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

@@ -291,7 +302,10 @@ cloud-image: $(PHOTON_STAGE) $(PHOTON_ISO_PATH)

 		echo "Unable to find photon iso file... aborting build"; \

 	fi

-check: check-bison check-g++ check-gawk check-createrepo check-texinfo check-sanity

+check: check-bison check-g++ check-gawk check-createrepo check-texinfo check-sanity check-docker

+

+check-docker:

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

 check-bison:

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

new file mode 100644

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

+{

+    "iso" : {

+        "title" : "Live CD Packages",

+        "file" : "packages_minimal.json",

+        "visible" : false,

+        "include" : "none",

+        "live-cd" : true

+    }

+}

new file mode 100755

@@ -0,0 +1,17 @@

+menu hshift 7

+menu width 61

+menu autoboot

+timeout 1

+noescape 1

+totaltimeout 1

+menu title Photon boot menu

+include stdmenu.cfg

+

+default PhotonOS	

+label PhotonOS

+	menu label ^PhotonOS

+	menu default

+	kernel vmlinuz

+	append initrd=initrd.img root=/dev/ram0 loglevel=3

+

+

@@ -30,6 +30,7 @@ PACKAGE_LIST_FILE=$3

 RPM_LIST=$4

 STAGE_PATH=$5

 ADDITIONAL_FILES_TO_COPY_FROM_STAGE=$6

+LIVE_CD=$7

 PHOTON_COMMON_DIR=$(dirname "${PACKAGE_LIST_FILE}")

 PACKAGE_LIST_FILE_BASE_NAME=$(basename "${PACKAGE_LIST_FILE}")

 #- Step 3 Setting up the boot loader

@@ -37,6 +38,7 @@ WORKINGDIR=${BUILDROOT}

 BUILDROOT=${BUILDROOT}/photon-chroot

 cp -r BUILD_DVD/isolinux ${WORKINGDIR}/

+mv ${WORKINGDIR}/isolinux/live-menu.cfg ${WORKINGDIR}/isolinux/menu.cfg

 cp sample_ks.cfg ${WORKINGDIR}/isolinux/

 find ${BUILDROOT} -name linux-[0-9]*.rpm | head -1 | xargs rpm2cpio | cpio -iv --to-stdout ./boot/vmlinuz* > ${WORKINGDIR}/isolinux/vmlinuz

@@ -65,6 +67,7 @@ mkdir -p ${BUILDROOT}/etc/systemd/scripts

 cp BUILD_DVD/fstab ${BUILDROOT}/etc/fstab

 #- Step 7 - Create installer script

+if [ "$LIVE_CD" = false ] ; then

 cat >> ${BUILDROOT}/bin/bootphotoninstaller << EOF

 #!/bin/bash

@@ -75,6 +78,8 @@ EOF

 chmod 755 ${BUILDROOT}/bin/bootphotoninstaller

+fi

+

 cat >> ${BUILDROOT}/init << EOF

 mount -t proc proc /proc

 /lib/systemd/systemd

@@ -84,7 +89,12 @@ chmod 755 ${BUILDROOT}/init

 #adding autologin to the root user

 sed -i "s/ExecStart.*/ExecStart=-\/sbin\/agetty --autologin root --noclear %I $TERM/g" ${BUILDROOT}/lib/systemd/system/getty@.service

-sed -i "s/root:.*/root:x:0:0:root:\/root:\/bin\/bootphotoninstaller/g" ${BUILDROOT}/etc/passwd

+#- Step 7 - Create installer script

+if [ "$LIVE_CD" = false ] ; then

+

+    sed -i "s/root:.*/root:x:0:0:root:\/root:\/bin\/bootphotoninstaller/g" ${BUILDROOT}/etc/passwd

+

+fi

 mkdir -p ${BUILDROOT}/mnt/photon-root/photon-chroot

 rm -rf ${BUILDROOT}/RPMS

@@ -116,23 +126,26 @@ createrepo --database ${WORKINGDIR}/RPMS

 rm -rf ${BUILDROOT}/LOGS

-# Cleaning up

-#Remove our rpm database as it fills up the ramdisk

-rm -rf ${BUILDROOT}/home/*

-rm -rf ${BUILDROOT}/var/lib/rpm

+if [ "$LIVE_CD" = false ] ; then

+    # Cleaning up

+    #Remove our rpm database as it fills up the ramdisk

+    rm -rf ${BUILDROOT}/home/*

+    rm -rf ${BUILDROOT}/var/lib/rpm

-# Remove the boot directory

-rm -rf ${BUILDROOT}/boot

+    # Remove the boot directory

+    rm -rf ${BUILDROOT}/boot

-#Remove the include files.

-rm -rf ${BUILDROOT}/usr/include

+    #Remove the include files.

+    rm -rf ${BUILDROOT}/usr/include

-# TODO: mbassiouny, Find a clean way to do that

-for i in `ls ${BUILDROOT}/usr/share/`; do

-	if [ $i != 'terminfo' -a $i != 'cracklib' -a $i != 'grub' ]; then

-		rm -rf ${BUILDROOT}/usr/share/$i

-	fi

-done

+    # TODO: mbassiouny, Find a clean way to do that

+    for i in `ls ${BUILDROOT}/usr/share/`; do

+    	if [ $i != 'terminfo' -a $i != 'cracklib' -a $i != 'grub' ]; then

+    		rm -rf ${BUILDROOT}/usr/share/$i

+    	fi

+    done

+

+fi

 # Generate the intird

 pushd $BUILDROOT

@@ -88,10 +88,11 @@ def create_rpm_list_to_copy_in_iso(build_install_option):

     options_sorted = option_list_json.items()

     packages = []

     for install_option in options_sorted:

-        file_path = os.path.join(base_path, install_option[1]["file"])

-        json_wrapper_package_list = JsonWrapper(file_path)

-        package_list_json = json_wrapper_package_list.read()

-        packages = packages + package_list_json["packages"]

+        if install_option[0] != "iso":

+            file_path = os.path.join(base_path, install_option[1]["file"])

+            json_wrapper_package_list = JsonWrapper(file_path)

+            package_list_json = json_wrapper_package_list.read()

+            packages = packages + package_list_json["packages"]

     return packages

 def create_additional_file_list_to_copy_in_iso(base_path, build_install_option):

@@ -104,6 +105,17 @@ def create_additional_file_list_to_copy_in_iso(base_path, build_install_option):

             file_list = file_list + map(lambda filename: os.path.join(base_path, filename), install_option[1].get("additional-files")) 

     return file_list

+def get_live_cd_status_string(build_install_option):

+    json_wrapper_option_list = JsonWrapper(build_install_option)

+    option_list_json = json_wrapper_option_list.read()

+    options_sorted = option_list_json.items()

+    file_list = []

+    for install_option in options_sorted:

+        if install_option[1].has_key("live-cd"):

+            if install_option[1].get("live-cd") == True:

+                return "true"

+    return "false"

+

 if __name__ == '__main__':

     usage = "Usage: %prog [options] <config file> <tools path>"

     parser = OptionParser(usage)

@@ -205,7 +217,8 @@ if __name__ == '__main__':

     if config['iso_system']:

         rpm_list = " ".join(create_rpm_list_to_copy_in_iso(options.package_list_file))

         files_to_copy = " ".join(create_additional_file_list_to_copy_in_iso(os.path.abspath(options.stage_path), options.package_list_file))

-        process = subprocess.Popen(['./mk-install-iso.sh', '-w', options.working_directory, options.iso_path, options.rpm_path, options.package_list_file, rpm_list, options.stage_path, files_to_copy])

+        live_cd = get_live_cd_status_string(options.package_list_file)

+        process = subprocess.Popen(['./mk-install-iso.sh', '-w', options.working_directory, options.iso_path, options.rpm_path, options.package_list_file, rpm_list, options.stage_path, files_to_copy, live_cd])

         retval = process.wait()

     # Cleaning up for vmdk