installer: fix kickstart installation

1) do not redirect STDOUT to /var/log/installer, but print it on the screen. /var/log/installer.log will be created by logger library. 2) eject cdrom not for the 'ui' path, but for 'live'. Change-Id: Iced0871d6c57b8c38263b1fd37c2b9826520b5be Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/8443 Reviewed-by: Anish Swaminathan <[email protected]> Tested-by: Anish Swaminathan <[email protected]>
GuoAlbert · Oct 31, 2019 · 135b59e · 135b59e
1 parent 307a865
commit 135b59e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/installer/installer.py b/installer/installer.py
@@ -310,6 +310,8 @@ def _install(self, stdscreen=None):
                                .format(self.progress_bar.time_elapsed))
             if self.interactive:
                 self.window.content_window().getch()
+
+        if self.install_config['live']:
             self._eject_cdrom()
 
     def _unsafe_install(self):

diff --git a/support/image-builder/iso/mk-install-iso.sh b/support/image-builder/iso/mk-install-iso.sh
@@ -153,7 +153,7 @@ cd /installer
 ACTIVE_CONSOLE="\$(< /sys/devices/virtual/tty/console/active)"
 
 install() {
-  LANG=en_US.UTF-8 ./isoInstaller.py --json-file=$PACKAGE_LIST_FILE_BASE_NAME -r /mnt/cdrom/RPMS 2>/var/log/installer && shutdown -r now
+  LANG=en_US.UTF-8 ./isoInstaller.py --json-file=$PACKAGE_LIST_FILE_BASE_NAME -r /mnt/cdrom/RPMS && shutdown -r now
 }
 
 try_run_installer() {