@@ -207,11 +207,21 @@ class Installer(object):

     def install_package(self,  package_name):

         rpm_params = ''

-        

+

+        os.environ["RPMROOT"] = self.photon_root + '/RPMS'

+        rpm_params = rpm_params + ' --force '

+        rpm_params = rpm_params + ' --root ' + self.photon_root

+

         if ('type' in self.install_config and (self.install_config['type'] in ['micro', 'minimal'])) or self.install_config['iso_system']:

             rpm_params = rpm_params + ' --excludedocs '

-        process = subprocess.Popen([self.chroot_command, '-w', self.photon_root, self.install_package_command, '-w', self.photon_root, package_name, rpm_params],  stdout=self.output)

+        if self.iso_installer:

+            rpm_params = rpm_params + ' --dbpath ' + '/var/lib/rpm '

+        else:

+            rpm_params = rpm_params + ' --dbpath ' + self.photon_root + '/var/lib/rpm '

+

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

+

         return process.wait()

     def execute_modules(self, phase):

@@ -22,15 +22,13 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name

 # Grab the name of the iso file 

 if [ $# -lt 2 ]

-	then

-		echo "Usage : " $0 " <output-iso-with-path>  <tools path>"

-		exit 1

+then

+    echo "Usage : " $0 " <output-iso-with-path>  <rpms-path> <pkg-list-path>"

+    exit 1

 fi

 ISO_OUTPUT_NAME=$1

-TOOLS_PATH=$2

-RPMS_PATH=$3

-PACKAGE_LIST_FILE=$4

-

+RPMS_PATH=$2

+PACKAGE_LIST_FILE=$3

 #- Step 3 Setting up the boot loader

 WORKINGDIR=${BUILDROOT}

@@ -90,7 +88,6 @@ sed -i "s/root:.*/root:x:0:0:root:\/root:\/bin\/bootphotoninstaller/g" ${BUILDRO

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

 rm -rf ${BUILDROOT}/RPMS

 cp -r ${RPMS_PATH} ${WORKINGDIR}/

-cp $TOOLS_PATH/tools.tar.gz ${WORKINGDIR}/

 #creating rpm repo in cd..

 createrepo --database ${WORKINGDIR}/RPMS

@@ -105,7 +102,6 @@ for i in `ls ${BUILDROOT}/usr/share/`; do

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

 	fi

 done

-rm -rf $BUILDROOT/tools

 # Generate the intird

 pushd $BUILDROOT

@@ -20,17 +20,16 @@ RPM_PARAMS="-Uvh"

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

 if [ $# -ge 2 ]

-  then

+then

     RPM_PARAMS="-Uvh $2"

 fi

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

+

 RPMPKG=""

-RPMPKG=$(find ../RPMS -name "$1-[0-9]*.rpm" -print)

+RPMPKG=$(find ${RPMROOT} -name "$1-[0-9]*.rpm" -print)

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

-case $1 in

-	linux-dev | linux-docs | glibc | gmp | gcc | bzip2 | ncurses | util-linux | e2fsprogs | shadow | bison | perl | texinfo | vim | linux | udev | rpm | dbus)

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

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

-esac

+

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

+

 exit 0

@@ -37,19 +37,8 @@ if mountpoint ${BUILDROOT}/dev/pts	>/dev/null 2>&1; then umount ${BUILDROOT}/dev

 if mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then umount ${BUILDROOT}/dev; fi

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

-#

-# Setup tools if tools.tar.gz already exists

-#

-[ -b $TOOLS_PATH/tools.tar.gz ] || {

-	run_command " Uncompressing tools" "tar -C ${BUILDROOT} -xzvf $TOOLS_PATH/tools.tar.gz" "${LOGFILE}"

-		

-	rm -rf /tools || true

-	if [ ! -e /tools ]; then 

-		ln -s ${BUILDROOT}/tools /tools || true

-    fi

-    PATH=$PATH:/tools/bin

-    }

 cd ${BUILDROOT} || fail "${PRGNAME}: Change directory: ${BUILDROOT}: FAILURE"

+

 #

 #	Setup the filesystem for chapter 06

 #

@@ -57,18 +46,12 @@ mkdir -p LOGS

 RPMPKG="$(find RPMS -name 'filesystem-[0-9]*.rpm' -print)"

 [ -z ${RPMPKG} ] && fail "	Filesystem rpm package missing: Can not continue"

 run_command "	Installing filesystem" "rpm -Uvh --nodeps --root ${BUILDROOT} ${RPMPKG}" "LOGS/filesystem.completed"

-run_command "	Creating symlinks: /tools/bin/{bash,cat,echo,pwd,stty}" "ln -fsv /tools/bin/{bash,cat,echo,pwd,stty} ${BUILDROOT}/bin"   "LOGS/filesystem.completed"

-run_command "	Creating symlinks: /tools/bin/perl /usr/bin" "ln -fsv /tools/bin/perl ${BUILDROOT}/usr/bin" "LOGS/filesystem.completed"

-run_command "	Creating symlinks: /tools/lib/libgcc_s.so{,.1}" "ln -fsv /tools/lib/libgcc_s.so{,.1} ${BUILDROOT}/usr/lib" "LOGS/filesystem.completed"

-run_command "	Creating symlinks: /tools/lib/libstdc++.so{,.6} /usr/lib" "ln -fsv /tools/lib/libstdc++.so{,.6} ${BUILDROOT}/usr/lib"	 "LOGS/filesystem.completed"

-#run_command "	Sed: /usr/lib/libstdc++.la" "sed 's/tools/usr/' ${BUILDROOT}/tools/lib/libstdc++.la > ${BUILDROOT}/usr/lib/libstdc++.la" "LOGS/filesystem.completed"

-run_command "	Creating symlinks: bash /bin/sh" "ln -fsv bash ${BUILDROOT}/bin/sh" "LOGS/filesystem.completed"

 # 	Ommited in the filesystem.spec file - not needed for booting

 [ -e ${BUILDROOT}/dev/console ]	|| mknod -m 600 ${BUILDROOT}/dev/console c 5 1

-[ -e ${BUILDROOT}/dev/null ]		|| mknod -m 666 ${BUILDROOT}/dev/null c 1 3

-[ -e ${BUILDROOT}/dev/random ]    || mknod -m 444 ${BUILDROOT}/dev/random c 1 8

-[ -e ${BUILDROOT}/dev/urandom ]    || mknod -m 444 ${BUILDROOT}/dev/urandom c 1 9

+[ -e ${BUILDROOT}/dev/null ]    || mknod -m 666 ${BUILDROOT}/dev/null c 1 3

+[ -e ${BUILDROOT}/dev/random ]  || mknod -m 444 ${BUILDROOT}/dev/random c 1 8

+[ -e ${BUILDROOT}/dev/urandom ] || mknod -m 444 ${BUILDROOT}/dev/urandom c 1 9

 chown -R 0:0 ${BUILDROOT}/*	|| fail "${PRGNAME}: Changing ownership: ${BUILDROOT}: FAILURE"

@@ -28,11 +28,11 @@ LOGFILE=/var/log/"${PRGNAME}-${LOGFILE}"	#	set log file name

 #	Goto chroot and run the command specified as parameter.

 #

 chroot "${BUILDROOT}" \

-	/tools/bin/env -i \

+	/usr/bin/env -i \

 	HOME=/root \

 	TERM="$TERM" \

 	PS1='\u:\w\$ ' \

-	PATH=/bin:/usr/bin:/sbin:/usr/sbin:/tools/bin \

-	/tools/bin/bash --login +h -c "cd installer;$*"

+	PATH=/bin:/usr/bin:/sbin:/usr/sbin \

+	/usr/bin/bash --login +h -c "cd installer;$*"

 exit 0

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

     # Making the iso if needed

     if config['iso_system']:

-        process = subprocess.Popen(['./mk-install-iso.sh', '-w', options.working_directory, options.iso_path, options.tools_path, options.rpm_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])

         retval = process.wait()

     # Cleaning up for vmdk

@@ -20,6 +20,9 @@ class constants(object):

     listCoreToolChainRPMPackages=["linux-api-headers", "glibc","glibc-devel",  "zlib","zlib-devel",  "file",

         "binutils","binutils-devel",  "gmp","gmp-devel", "mpfr", "mpfr-devel", "mpc",

         "libgcc","libgcc-devel","libstdc++","libstdc++-devel","libgomp","libgomp-devel","gcc",

+        "pkg-config","bash", "glibc","glibc-devel", "zlib","zlib-devel", "file",

+        "binutils","binutils-devel",  "gmp","gmp-devel", "mpfr", "mpfr-devel", "mpc",

+        "libgcc","libgcc-devel","libstdc++","libstdc++-devel","libgomp","libgomp-devel","gcc",

         "pkg-config","bash"]

     listToolChainRPMPkgsToInstall=["linux-api-headers", "glibc","glibc-devel",  "zlib","zlib-devel",  "file",