Skip the end message dialog and go straight to reboot

This commit is contained in:
Bob Mottram 2016-12-12 15:39:15 +00:00
parent 9bf944efb0
commit 8009661cee
3 changed files with 2 additions and 9 deletions

View File

@ -340,5 +340,7 @@ setup_web
setup_apps $command_options
setup_final
echo ''
echo "${PROJECT_NAME} installation is complete"
exit 0

View File

@ -395,18 +395,12 @@ EOF
echo ' rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
echo " touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
echo ' shred -zu ~/login.txt' >> $rootdir/root/.bashrc
END_MESSAGE1=$'Congratulations!'
if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
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'
echo ' SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
echo ' if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
echo ' exit 62392' >> $rootdir/root/.bashrc
echo ' fi' >> $rootdir/root/.bashrc
END_MESSAGE_HEIGHT=16
else
END_MESSAGE2=$'\nYour system has now installed\n\nPress any key to reboot and begin using it'
END_MESSAGE_HEIGHT=12
fi
echo " if [ -f /root/${PROJECT_NAME}-wifi.cfg ]; then" >> $rootdir/root/.bashrc
echo " echo '[Unit]' > /etc/systemd/system/wifistart.service" >> $rootdir/root/.bashrc
@ -427,7 +421,6 @@ EOF
echo " systemctl enable wifistart" >> $rootdir/root/.bashrc
echo " systemctl daemon-reload" >> $rootdir/root/.bashrc
echo ' fi' >> $rootdir/root/.bashrc
echo " dialog --title '$END_MESSAGE1' --msgbox \"$END_MESSAGE2\" ${END_MESSAGE_HEIGHT} 60" >> $rootdir/root/.bashrc
echo ' reboot' >> $rootdir/root/.bashrc
echo ' fi' >> $rootdir/root/.bashrc
echo ' else' >> $rootdir/root/.bashrc

View File

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