Merge pull request #56 from guysoft/revert-52-patch-1

Revert "Make secondary VNC failure more descriptive."
guysoft · Jul 18, 2016 · 1fa1e93 · 1fa1e93
2 parents 9735ade + d0dbea1
commit 1fa1e93
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/src/chroot_script b/src/chroot_script
@@ -80,14 +80,13 @@ unpack /filesystem/root /
 sed -i 's/#user-session=.*/user-session=fullpageos/g' /etc/lightdm/lightdm.conf
 sed -i 's/#autologin-user=.*/autologin-user=pi/g' /etc/lightdm/lightdm.conf
 
-# Set up x11vnc
+#set up x11vnc
 sudo -u pi /home/pi/scripts/setX11vncPass raspberry
 if [ ! -f /home/pi/.vnc/passwd ]; then
-  echo "/home/pi/.vnc/passwd was not created. Trying again."
+  echo "/home/pi/.vnc/passwd was not created"
   sudo -u pi /home/pi/scripts/setX11vncPass raspberry
   if [ ! -f /home/pi/.vnc/passwd ]; then
-    echo "/home/pi/.vnc/passwd was not created again. Giving up."
-    echo "Failed to set a VNC password. Aborting build."
+    echo "failed again"
     exit 1
   fi
 fi