From ca417ad491794a5deea396252356f43ba87ddbeb Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 21 Nov 2015 13:46:46 +0000
Subject: [PATCH] Since hrng enable and ssh host key generation is done with
 the image builder we no longer need the reboot

---
 src/freedombone | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index 465daadf..6499d269 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -3768,7 +3768,7 @@ function create_restore_script {
   echo "  if [ -d /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME} ]; then" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "      ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/privkey.pem /etc/ssl/private/${FULLBLOG_DOMAIN_NAME}.key" >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo "      ln -s /etc/letsencrypt/live/${FULLBLOG_DOMAIN_NAME}/fullchain.pem /etc/ssl/certs/${FULLBLOG_DOMAIN_NAME}.pem" >> /usr/bin/$RESTORE_SCRIPT_NAME
-  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME  
+  echo '  fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo 'fi' >> /usr/bin/$RESTORE_SCRIPT_NAME
   echo '' >> /usr/bin/$RESTORE_SCRIPT_NAME
 
@@ -4854,7 +4854,7 @@ function restore_database_from_friend {
   echo '          if [ -d /etc/letsencrypt/live/${2} ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '              ln -s /etc/letsencrypt/live/${2}/privkey.pem /etc/ssl/private/${2}.key' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '              ln -s /etc/letsencrypt/live/${2}/fullchain.pem /etc/ssl/certs/${2}.pem' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
-  echo '          else' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME  
+  echo '          else' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '              # Ensure that the bundled SSL cert is being used' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '              if [ -f /etc/ssl/certs/${2}.bundle.crt ]; then' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
   echo '                  sed -i "s|${2}.crt|${2}.bundle.crt|g" /etc/nginx/sites-available/${2}' >> /usr/bin/$RESTORE_FROM_FRIEND_SCRIPT_NAME
@@ -6164,18 +6164,18 @@ function configure_ssh {
   if [[ $INSTALLED_WITHIN_DOCKER == "yes" || $INSTALLING_ON_BBB != "yes" ]]; then
       return
   fi
-  echo ''
-  echo ''
-  echo '  *** Rebooting to initialise ssh settings and random number generator ***'
-  echo ''
-  echo "  *** Reconnect via ssh on port $SSH_PORT, then run this script again  ***"
-  echo ''
-  echo '## ' >> /etc/motd
-  echo '## Type "su" and enter your administrator password, then use the command:' >> /etc/motd
-  echo '## ' >> /etc/motd
-  echo '##   freedombone -c freedombone.cfg' >> /etc/motd
-  echo '## ' >> /etc/motd
-  echo '## to continue the installation.' >> /etc/motd
+  #echo ''
+  #echo ''
+  #echo '  *** Rebooting to initialise ssh settings and random number generator ***'
+  #echo ''
+  #echo "  *** Reconnect via ssh on port $SSH_PORT, then run this script again  ***"
+  #echo ''
+  #echo '## ' >> /etc/motd
+  #echo '## Type "su" and enter your administrator password, then use the command:' >> /etc/motd
+  #echo '## ' >> /etc/motd
+  #echo '##   freedombone -c freedombone.cfg' >> /etc/motd
+  #echo '## ' >> /etc/motd
+  #echo '## to continue the installation.' >> /etc/motd
   reboot
 }
 
@@ -10093,7 +10093,7 @@ function install_hubzilla {
           if [[ "$CURRENT_HUBZILLA_COMMIT" != "$HUBZILLA_COMMIT" ]]; then
               cd /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
               git stash
-              git checkout master             
+              git checkout master
               git pull
               git checkout $HUBZILLA_COMMIT
               git branch -b $HUBZILLA_COMMIT
@@ -10102,7 +10102,7 @@ function install_hubzilla {
           fi
       fi
   fi
-  
+
   if grep -Fxq "install_hubzilla" $COMPLETION_FILE; then
       return
   fi
@@ -10131,7 +10131,7 @@ function install_hubzilla {
       else
           sed -i "s/Hubzilla commit.*/Hubzilla commit:$HUBZILLA_COMMIT/g" $COMPLETION_FILE
       fi
-      
+
       rm -rf /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
       mv hubzilla /var/www/$HUBZILLA_DOMAIN_NAME/htdocs
       chown -R www-data:www-data /var/www/$HUBZILLA_DOMAIN_NAME/htdocs