Browse Source

Skip the end message dialog and go straight to reboot

Bob Mottram 8 years ago
parent
commit
8009661cee
3 changed files with 2 additions and 9 deletions
  1. 2
    0
      src/freedombone
  2. 0
    7
      src/freedombone-image-customise
  3. 0
    2
      src/freedombone-utils-final

+ 2
- 0
src/freedombone View File

@@ -340,5 +340,7 @@ setup_web
340 340
 setup_apps $command_options
341 341
 setup_final
342 342
 
343
+echo ''
343 344
 echo "${PROJECT_NAME} installation is complete"
345
+
344 346
 exit 0

+ 0
- 7
src/freedombone-image-customise View File

@@ -395,18 +395,12 @@ EOF
395 395
     echo '            rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
396 396
     echo "            touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
397 397
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
398
-    END_MESSAGE1=$'Congratulations!'
399 398
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
400
-        END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at:\n\n  ${SSH_ONION_HOSTNAME}\n\nTo copy the above address hold down the shift key and double left click on it, then right click and select "copy".\n\nPress any key to reboot and begin using the system'
401 399
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
402 400
 
403 401
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
404 402
         echo '                exit 62392' >> $rootdir/root/.bashrc
405 403
         echo '            fi' >> $rootdir/root/.bashrc
406
-        END_MESSAGE_HEIGHT=16
407
-    else
408
-        END_MESSAGE2=$'\nYour system has now installed\n\nPress any key to reboot and begin using it'
409
-        END_MESSAGE_HEIGHT=12
410 404
     fi
411 405
     echo "            if [ -f /root/${PROJECT_NAME}-wifi.cfg ]; then" >> $rootdir/root/.bashrc
412 406
     echo "                echo '[Unit]' > /etc/systemd/system/wifistart.service" >> $rootdir/root/.bashrc
@@ -427,7 +421,6 @@ EOF
427 421
     echo "                systemctl enable wifistart" >> $rootdir/root/.bashrc
428 422
     echo "                systemctl daemon-reload" >> $rootdir/root/.bashrc
429 423
     echo '            fi' >> $rootdir/root/.bashrc
430
-    echo "            dialog --title '$END_MESSAGE1' --msgbox \"$END_MESSAGE2\" ${END_MESSAGE_HEIGHT} 60" >> $rootdir/root/.bashrc
431 424
     echo '            reboot' >> $rootdir/root/.bashrc
432 425
     echo '        fi' >> $rootdir/root/.bashrc
433 426
     echo '    else' >> $rootdir/root/.bashrc

+ 0
- 2
src/freedombone-utils-final View File

@@ -46,8 +46,6 @@ function install_final {
46 46
     echo ''
47 47
 
48 48
     echo $"
49
-*** ${PROJECT_NAME} installation is complete ***
50
-
51 49
 If you wish to verify the server ssh public key at next login it is:
52 50
 $(get_ssh_server_key)
53 51