Browse Source

Improve final install instructions for onion variant

Bob Mottram 8 years ago
parent
commit
f9f56b2784
1 changed files with 4 additions and 2 deletions
  1. 4
    2
      src/freedombone-image-customise

+ 4
- 2
src/freedombone-image-customise View File

@@ -401,16 +401,18 @@ EOF
401 401
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
402 402
     END_MESSAGE1=$'Congratulations!'
403 403
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
404
-        END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at $SSH_ONION_HOSTNAME\n\nPress any key to reboot and begin using it'
404
+        END_MESSAGE2=$'\nYour system has now installed\n\nThe onion ssh service is at:\n\n  ssh ${MY_USERNAME}@${SSH_ONION_HOSTNAME} -p ${SSH_PORT}\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'
405 405
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
406 406
 
407 407
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
408 408
         echo '                exit 62392' >> $rootdir/root/.bashrc
409 409
         echo '            fi' >> $rootdir/root/.bashrc
410
+        END_MESSAGE_HEIGHT=16
410 411
     else
411 412
         END_MESSAGE2=$'\nYour system has now installed\n\nPress any key to reboot and begin using it'
413
+        END_MESSAGE_HEIGHT=12
412 414
     fi
413
-    echo "            dialog --title '$END_MESSAGE1' --msgbox \"$END_MESSAGE2\" 12 50" >> $rootdir/root/.bashrc
415
+    echo "            dialog --title '$END_MESSAGE1' --msgbox \"$END_MESSAGE2\" ${END_MESSAGE_HEIGHT} 60" >> $rootdir/root/.bashrc
414 416
     echo '            reboot' >> $rootdir/root/.bashrc
415 417
     echo '        fi' >> $rootdir/root/.bashrc
416 418
     echo '    else' >> $rootdir/root/.bashrc