@@ -40,7 +40,8 @@ iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) $(PHOTON_TOOLCHAIN_MINIMAL)

 	@cd $(PHOTON_INSTALLER_DIR) && \

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

                         -w $(PHOTON_STAGE)/photon_iso \

-                        -t $(PHOTON_STAGE) \

+                        -l $(PHOTON_STAGE)/LOGS \

+                        -r $(PHOTON_STAGE)/RPMS \

                         -p $(PHOTON_INSTALLER_PACKAGE_LIST) \

                         -f > \

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

@@ -23,11 +23,10 @@ from window import Window

 from actionresult import ActionResult

 class Installer(object):

-    def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, tools_path = "../stage", rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

+    def __init__(self, install_config, maxy = 0, maxx = 0, iso_installer = False, rpm_path = "../stage/RPMS", log_path = "../stage/LOGS", ks_config = None):

         self.install_config = install_config

         self.ks_config = ks_config

         self.iso_installer = iso_installer

-        self.tools_path = tools_path

         self.rpm_path = rpm_path

         self.log_path = log_path

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

@@ -189,7 +188,7 @@ class Installer(object):

         self.copy_files()

         #Setup the filesystem basics

-        process = subprocess.Popen([self.prepare_command, '-w', self.photon_root, self.tools_path], stdout=self.output)

+        process = subprocess.Popen([self.prepare_command, '-w', self.photon_root], stdout=self.output)

         retval = process.wait()

     def finalize_system(self):

@@ -103,7 +103,7 @@ class IsoInstaller(object):

         root_password_reader = WindowStringReader(self.maxy, self.maxx, 10, 70, True,  'Set up root password',

             'Root password:', 

             2, self.install_config)

-        installer = Installer(self.install_config, self.maxy, self.maxx, True, tools_path=cd_path, rpm_path=os.path.join(cd_path, "RPMS"), log_path="/var/log", ks_config=ks_config)

+        installer = Installer(self.install_config, self.maxy, self.maxx, True, rpm_path=os.path.join(cd_path, "RPMS"), log_path="/var/log", ks_config=ks_config)

         # This represents the installer screen, the bool indicated if I can go back to this window or not

         items = []

@@ -28,6 +28,8 @@ fi

 RPMPKG=""

 RPMPKG=$(find ${RPMROOT} -name "$1-[0-9]*.rpm" -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}"

@@ -17,13 +17,6 @@ source config.inc

 source function.inc

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

-if [ $# -lt 1 ]; then

-   echo "Usage: $PRGNAME <tools path>"

-   exit 1

-fi

-

-TOOLS_PATH=$1

-

 LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name

 #LOGFILE=/dev/null		#	uncomment to disable log file

@@ -87,7 +87,7 @@ if __name__ == '__main__':

     parser.add_option("-i", "--iso-path",  dest="iso_path")

     parser.add_option("-v", "--vmdk-path", dest="vmdk_path")

     parser.add_option("-w",  "--working-directory",  dest="working_directory", default="/mnt/photon-root")

-    parser.add_option("-t",  "--tools-path",  dest="tools_path", default="../stage")

+    parser.add_option("-l",  "--log-path",  dest="log_path", default="../stage/LOGS")

     parser.add_option("-r",  "--rpm-path",  dest="rpm_path", default="../stage/RPMS")

     parser.add_option("-f", "--force", action="store_true", dest="force", default=False)

     parser.add_option("-p", "--package-list-file", dest="package_list_file", default="package_list.json")

@@ -168,7 +168,7 @@ if __name__ == '__main__':

     config['working_directory'] = options.working_directory

     # Run the installer

-    package_installer = Installer(config, tools_path = options.tools_path, rpm_path = options.rpm_path, log_path = options.tools_path + "/LOGS")

+    package_installer = Installer(config, rpm_path = options.rpm_path, log_path = options.log_path)

     package_installer.install(None)

     # Making the iso if needed