Merge pull request #310 from DL6JJ/patch-2

$FULLPAGEOS_OVERRIDE_PASSWORD overwrite VNC PW
guysoft · Dec 19, 2019 · 7f034e4 · 7f034e4
2 parents 111739b + 96ccca5
commit 7f034e4
Showing 1 changed file with 25 additions and 10 deletions.
diff --git a/src/modules/fullpageos/start_chroot_script b/src/modules/fullpageos/start_chroot_script
@@ -85,19 +85,34 @@ fi
 #override password
 if [ "$FULLPAGEOS_OVERRIDE_PASSWORD" != "default" ]
 then
+    #root password
     echo "pi:$FULLPAGEOS_OVERRIDE_PASSWORD" | chpasswd
+    # Set up x11vnc
+    sudo -u pi /home/pi/scripts/setX11vncPass "$FULLPAGEOS_OVERRIDE_PASSWORD"
+    if [ ! -f /home/pi/.vnc/passwd ]; then
+      echo "/home/pi/.vnc/passwd was not created. Trying again."
+      sudo -u pi /home/pi/scripts/setX11vncPass "$FULLPAGEOS_OVERRIDE_PASSWORD"
+      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."
+        exit 1
+       fi
+    fi
 fi
 
-# 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."
-  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."
-    exit 1
-  fi
+if [ "$FULLPAGEOS_OVERRIDE_PASSWORD" == "default" ]
+then
+    # 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."
+      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."
+        exit 1
+      fi
+    fi
 fi
 
 #echo "sudo -u pi startx /home/pi/scripts/run_onepageos &" >> /etc/rc.local