Sfoglia il codice sorgente

Skip the end message dialog and go straight to reboot

Bob Mottram 8 anni fa
parent
commit
8009661cee
3 ha cambiato i file con 2 aggiunte e 9 eliminazioni
  1. 2
    0
      src/freedombone
  2. 0
    7
      src/freedombone-image-customise
  3. 0
    2
      src/freedombone-utils-final

+ 2
- 0
src/freedombone Vedi File

340
 setup_apps $command_options
340
 setup_apps $command_options
341
 setup_final
341
 setup_final
342
 
342
 
343
+echo ''
343
 echo "${PROJECT_NAME} installation is complete"
344
 echo "${PROJECT_NAME} installation is complete"
345
+
344
 exit 0
346
 exit 0

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

395
     echo '            rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
395
     echo '            rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
396
     echo "            touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
396
     echo "            touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
397
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
397
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
398
-    END_MESSAGE1=$'Congratulations!'
399
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
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
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
399
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
402
 
400
 
403
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
401
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
404
         echo '                exit 62392' >> $rootdir/root/.bashrc
402
         echo '                exit 62392' >> $rootdir/root/.bashrc
405
         echo '            fi' >> $rootdir/root/.bashrc
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
     fi
404
     fi
411
     echo "            if [ -f /root/${PROJECT_NAME}-wifi.cfg ]; then" >> $rootdir/root/.bashrc
405
     echo "            if [ -f /root/${PROJECT_NAME}-wifi.cfg ]; then" >> $rootdir/root/.bashrc
412
     echo "                echo '[Unit]' > /etc/systemd/system/wifistart.service" >> $rootdir/root/.bashrc
406
     echo "                echo '[Unit]' > /etc/systemd/system/wifistart.service" >> $rootdir/root/.bashrc
427
     echo "                systemctl enable wifistart" >> $rootdir/root/.bashrc
421
     echo "                systemctl enable wifistart" >> $rootdir/root/.bashrc
428
     echo "                systemctl daemon-reload" >> $rootdir/root/.bashrc
422
     echo "                systemctl daemon-reload" >> $rootdir/root/.bashrc
429
     echo '            fi' >> $rootdir/root/.bashrc
423
     echo '            fi' >> $rootdir/root/.bashrc
430
-    echo "            dialog --title '$END_MESSAGE1' --msgbox \"$END_MESSAGE2\" ${END_MESSAGE_HEIGHT} 60" >> $rootdir/root/.bashrc
431
     echo '            reboot' >> $rootdir/root/.bashrc
424
     echo '            reboot' >> $rootdir/root/.bashrc
432
     echo '        fi' >> $rootdir/root/.bashrc
425
     echo '        fi' >> $rootdir/root/.bashrc
433
     echo '    else' >> $rootdir/root/.bashrc
426
     echo '    else' >> $rootdir/root/.bashrc

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

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