@@ -291,6 +291,13 @@ class Installer(object):

         if subprocess.call(['mkdir', '-p', rpm_cache_dir]) != 0 or subprocess.call(['mount', '--bind', self.rpm_path, rpm_cache_dir]) != 0:

             modules.commons.log(modules.commons.LOG_ERROR, "Fail to bind cache rpms")

             self.exit_gracefully(None, None)

+    def unbind_repo_dir(self):

+        rpm_cache_dir = self.photon_root + '/cache/tdnf/photon-iso/rpms'

+        if self.rpm_path.startswith("https://") or self.rpm_path.startswith("http://"):

+            return

+        if subprocess.call(['umount', rpm_cache_dir]) != 0  or subprocess.call(['rm', '-rf', rpm_cache_dir]) != 0:

+            modules.commons.log(modules.commons.LOG_ERROR, "Fail to unbind cache rpms")

+            self.exit_gracefully(None, None)

     def update_fstab(self):

         fstab_file = open(os.path.join(self.photon_root, "etc/fstab"), "w")

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

             # remove the installer directory

             process = subprocess.Popen(['rm', '-rf', os.path.join(self.photon_root, "installer")], stdout=self.output)

             retval = process.wait()

+            self.unbind_repo_dir()

             # Disable the swap file

             process = subprocess.Popen(['swapoff', '-a'], stdout=self.output)

             retval = process.wait()

@@ -6,65 +6,68 @@

 #      Author:  mbassiouny@vmware.com           #

 #     Options:                                  #

 #################################################

-#	Overview

-#		Preparing the system to install photon

-#	End

+#   Overview

+#       Preparing the system to install photon

+#   End

 #

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

-set -o nounset		# exit if variable not initalized

-set +h			# disable hashall

+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

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

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

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

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

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

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

-[ -z ${BUILDROOT} ]	&& fail "${PRGNAME}: Build root not set: FAILURE"

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

+[ -z ${BUILDROOT} ] && fail "${PRGNAME}: Build root not set: FAILURE"

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

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

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

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

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

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

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

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

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

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

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

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

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

 #

-#	Setup the filesystem for chapter 06

+#   Setup the filesystem for chapter 06

 #

-if [[	$# -gt 0 ]] && [[ $1 == 'install' ]]; then

-	mkdir -p ${BUILDROOT}/var/lib/rpm

-	mkdir -p ${BUILDROOT}/cache/tdnf

-	#Setup the disk

-	dd if=/dev/zero of=${BUILDROOT}/cache/swapfile bs=1M count=64

+if [[   $# -gt 0 ]] && [[ $1 == 'install' ]]; then

+    mkdir -p ${BUILDROOT}/var/lib/rpm

+    mkdir -p ${BUILDROOT}/cache/tdnf

+    #Setup the disk

+    dd if=/dev/zero of=${BUILDROOT}/cache/swapfile bs=1M count=64

+    chmod 600 ${BUILDROOT}/cache/swapfile

     mkswap -v1 ${BUILDROOT}/cache/swapfile

     swapon ${BUILDROOT}/cache/swapfile

-	rpm   --root ${BUILDROOT} --initdb

+    rpm   --root ${BUILDROOT} --initdb

     tdnf install filesystem --installroot ${BUILDROOT} --nogpgcheck --assumeyes

 else

-	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} --dbpath /var/lib/rpm ${RPMPKG}" "${LOGFILE}"

+    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} --dbpath /var/lib/rpm ${RPMPKG}" "${LOGFILE}"

 fi

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

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

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

-chown -R 0:0 ${BUILDROOT}/*	|| :

+if [[   $# -eq 0 ]] || [[ $1 != 'install' ]]; then

+    chown -R 0:0 ${BUILDROOT}/* || :

+fi

 #

-#	Mount kernel filesystem

+#   Mount kernel filesystem

 #

-if ! mountpoint ${BUILDROOT}/dev	>/dev/null 2>&1; then mount --bind /dev ${BUILDROOT}/dev; fi

-if ! mountpoint ${BUILDROOT}/dev/pts	>/dev/null 2>&1; then mount -t devpts devpts ${BUILDROOT}/dev/pts -o gid=5,mode=620; fi

-if ! mountpoint ${BUILDROOT}/proc	>/dev/null 2>&1; then mount -t proc proc ${BUILDROOT}/proc; fi

-if ! mountpoint ${BUILDROOT}/sys 	>/dev/null 2>&1; then mount -t sysfs sysfs ${BUILDROOT}/sys; fi

-if ! mountpoint ${BUILDROOT}/run	>/dev/null 2>&1; then mount -t tmpfs tmpfs ${BUILDROOT}/run; fi

-if [ -h ${BUILDROOT}/dev/shm ];			 then mkdir -pv ${BUILDROOT}/$(readlink ${BUILDROOT}/dev/shm); fi

+if ! mountpoint ${BUILDROOT}/dev    >/dev/null 2>&1; then mount --bind /dev ${BUILDROOT}/dev; fi

+if ! mountpoint ${BUILDROOT}/dev/pts    >/dev/null 2>&1; then mount -t devpts devpts ${BUILDROOT}/dev/pts -o gid=5,mode=620; fi

+if ! mountpoint ${BUILDROOT}/proc   >/dev/null 2>&1; then mount -t proc proc ${BUILDROOT}/proc; fi

+if ! mountpoint ${BUILDROOT}/sys    >/dev/null 2>&1; then mount -t sysfs sysfs ${BUILDROOT}/sys; fi

+if ! mountpoint ${BUILDROOT}/run    >/dev/null 2>&1; then mount -t tmpfs tmpfs ${BUILDROOT}/run; fi

+if [ -h ${BUILDROOT}/dev/shm ];          then mkdir -pv ${BUILDROOT}/$(readlink ${BUILDROOT}/dev/shm); fi

 exit 0