Browse Source

Save tox bootstrap ID

Bob Mottram 9 years ago
parent
commit
937dc57b36
1 changed files with 9 additions and 4 deletions
  1. 9
    4
      src/freedombone

+ 9
- 4
src/freedombone View File

@@ -392,6 +392,7 @@ ENABLE_SOCIAL_KEY_MANAGEMENT="no"
392 392
 
393 393
 TOX_PORT=33445
394 394
 TOX_REPO='git://github.com/irungentoo/toxcore.git'
395
+TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt
395 396
 # These are some default nodes, but you can replace them with trusted nodes
396 397
 # as you prefer. See https://wiki.tox.im/Nodes
397 398
 TOX_NODE=
@@ -5169,12 +5170,13 @@ function change_login_message {
5169 5170
   if [[ $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then
5170 5171
       echo '             D E V E L O P E R   E D I T I O N' >> /etc/motd
5171 5172
   fi
5172
-  if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
5173
-      echo '                   M E S H   E D I T I O N' >> /etc/motd
5174
-  fi
5175 5173
 
5176 5174
   echo '' >> /etc/motd
5177
-  echo '                  Freedom in the Cloud' >> /etc/motd
5175
+  if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
5176
+      echo '                  Freedom in the Cloud' >> /etc/motd
5177
+  else
5178
+      echo '                   Freedom in the Mesh' >> /etc/motd
5179
+  fi
5178 5180
   echo '' >> /etc/motd
5179 5181
   echo 'change_login_message' >> $COMPLETION_FILE
5180 5182
 }
@@ -8284,6 +8286,9 @@ function install_tox_node {
8284 8286
       exit 6529
8285 8287
   fi
8286 8288
 
8289
+  # save the public key for later reference
8290
+  echo "$TOX_PUBLIC_KEY" > $TOX_BOOTSTRAP_ID_FILE
8291
+  
8287 8292
   configure_firewall_for_tox
8288 8293
 
8289 8294
   if ! grep -q "Tox node" /home/$MY_USERNAME/README; then