@@ -35,7 +35,6 @@ class Installer(object):

         self.mount_command = "./mk-mount-disk.sh"

         self.prepare_command = "./mk-prepare-system.sh"

         self.finalize_command = "./mk-finalize-system.sh"

-        self.install_package_command = "./mk-install-package.sh"

         self.chroot_command = "./mk-run-chroot.sh"

         self.setup_grub_command = "./mk-setup-grub.sh"

         self.unmount_disk_command = "./mk-unmount-disk.sh"

@@ -119,10 +119,10 @@ EOF

 #- Step 7 - Create installer script

 if [ "$LIVE_CD" = false ] ; then

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

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

 #!/bin/bash

 cd /installer

-[ `tty` == '/dev/tty1' ] && ./isoInstaller.py --json-file=$PACKAGE_LIST_FILE_BASE_NAME 2> /var/log/installer && shutdown -r now

+[ \`tty\` == '/dev/tty1' ] && ./isoInstaller.py --json-file=$PACKAGE_LIST_FILE_BASE_NAME 2> /var/log/installer && shutdown -r now

 /bin/bash

 EOF

deleted file mode 100755

@@ -1,37 +0,0 @@

-#!/bin/bash

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

-#       Title:  mk-install-package              #

-#        Date:  2014-11-26                      #

-#     Version:  1.0                             #

-#      Author:  mbassiouny@vmware.com           #

-#     Options:                                  #

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

-#	Overview

-#		install a passed package into a photon system

-#	End

-#

-set -o errexit		# exit if error...insurance ;

-set -o nounset		# exit if variable not initalized

-set +h			# disable hashall

-source config.inc

-source function.inc

-PRGNAME=${0##*/}	# script name minus the path

-RPM_PARAMS="-Uvh"

-LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"

-

-if [ $# -ge 2 ]

-then

-    RPM_PARAMS="-Uvh $2"

-fi

-

-[ ${EUID} -eq 0 ] 	|| fail "${PRGNAME}: Need to be root user: FAILURE"

-

-RPMPKG=""

-RPMPKG=$(find ${RPMROOT} -name "$1" -print)

-# TODO: sometimes we catch several items into RPMPKG.

-# In case we have several releases in rpm cache. Need to handle that.

-[ -z $RPMPKG ] && fail "installation error: rpm package not found\n"

-

-run_command "Installing: $1" "rpm --nodeps ${RPM_PARAMS} ${RPMPKG}" "${LOGFILE}"

-

-exit 0

@@ -7,7 +7,7 @@

         "locale-gen.sh", "version-check",

         "config.inc", "function.inc",

         "mkinitramfs", "init.in",

-        "mk-finalize-system.sh", "mk-install-package.sh"

+        "mk-finalize-system.sh"

     ],

     "iso_tools": [

         "boot", "../stage/RPMS"