Browse code

fix installer

Change-Id: Ia1097b76e5e6fac96bc7bb42b628143fe5ef973d
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/2858
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Xiaolin Li <xiaolinl@vmware.com>

Bo Gan authored on 2017/06/03 08:55:09
Showing 1 changed files
... ...
@@ -106,23 +106,23 @@ mkdir -p ${BUILDROOT}/etc/systemd/scripts
106 106
 cp BUILD_DVD/fstab ${BUILDROOT}/etc/fstab
107 107
 
108 108
 mkdir -p ${BUILDROOT}/etc/yum.repos.d
109
-cat >> ${BUILDROOT}/etc/yum.repos.d/photon-iso.repo <<EOF
109
+cat >> ${BUILDROOT}/etc/yum.repos.d/photon-iso.repo << EOF
110 110
 [photon-iso]
111 111
 name=VMWare Photon Linux 1.0(x86_64)
112 112
 baseurl=file:///mnt/cdrom/RPMS
113 113
 gpgkey=file:///etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY
114 114
 gpgcheck=1
115 115
 enabled=1
116
-skip_if_unavailable=True​
116
+skip_if_unavailable=True
117 117
 EOF
118 118
 
119 119
 #- Step 7 - Create installer script
120 120
 if [ "$LIVE_CD" = false ] ; then
121 121
 
122
-cat >> ${BUILDROOT}/bin/bootphotoninstaller << EOF
122
+cat >> ${BUILDROOT}/bin/bootphotoninstaller << 'EOF'
123 123
 #!/bin/bash
124 124
 cd /installer
125
-./isoInstaller.py --json-file=$PACKAGE_LIST_FILE_BASE_NAME 2> /var/log/installer && shutdown -r now
125
+[ `tty` == '/dev/tty1' ] && ./isoInstaller.py --json-file=$PACKAGE_LIST_FILE_BASE_NAME 2> /var/log/installer && shutdown -r now
126 126
 /bin/bash
127 127
 EOF
128 128