Bob Mottram 8 gadus atpakaļ
vecāks
revīzija
cf9e60ad47
1 mainītis faili ar 2 papildinājumiem un 4 dzēšanām
  1. 2
    4
      src/freedombone-image-customise

+ 2
- 4
src/freedombone-image-customise Parādīt failu

392
     echo "        if [ -f ~/${PROJECT_NAME}-completed.txt ]; then" >> $rootdir/root/.bashrc
392
     echo "        if [ -f ~/${PROJECT_NAME}-completed.txt ]; then" >> $rootdir/root/.bashrc
393
     # Remove the initial setup files
393
     # Remove the initial setup files
394
     echo '            rm /root/.initial_setup' >> $rootdir/root/.bashrc
394
     echo '            rm /root/.initial_setup' >> $rootdir/root/.bashrc
395
-    echo "            MY_USERNAME=${MY_USERNAME}" >> $rootdir/root/.bashrc
396
-    echo "            SSH_PORT=${SSH_PORT}" >> $rootdir/root/.bashrc
397
-    echo '            rm /home/${MY_USERNAME}/.initial_setup' >> $rootdir/root/.bashrc
395
+    echo '            rm /home/fbone/.initial_setup' >> $rootdir/root/.bashrc
398
     echo "            touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
396
     echo "            touch /root/.remove_${GENERIC_IMAGE_USERNAME}" >> $rootdir/root/.bashrc
399
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
397
     echo '            shred -zu ~/login.txt' >> $rootdir/root/.bashrc
400
     END_MESSAGE1=$'Congratulations!'
398
     END_MESSAGE1=$'Congratulations!'
401
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
399
     if [[ $VARIANT != "mesh" && $VARIANT != "meshclient" && $VARIANT != "meshusb" && $VARIANT != "usb" ]]; then
402
-        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'
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'
403
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
401
         echo '            SSH_ONION_HOSTNAME=$(cat /var/lib/tor/hidden_service_ssh/hostname)' >> $rootdir/root/.bashrc
404
 
402
 
405
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc
403
         echo '            if [ ${#SSH_ONION_HOSTNAME} -lt 2 ]; then' >> $rootdir/root/.bashrc