From 937dc57b36f2a30aa4d8c9068a0741161f65425f Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 26 Aug 2015 18:41:58 +0100 Subject: [PATCH] Save tox bootstrap ID --- src/freedombone | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/freedombone b/src/freedombone index 407fa993..d6d7d8bf 100755 --- a/src/freedombone +++ b/src/freedombone @@ -392,6 +392,7 @@ ENABLE_SOCIAL_KEY_MANAGEMENT="no" TOX_PORT=33445 TOX_REPO='git://github.com/irungentoo/toxcore.git' +TOX_BOOTSTRAP_ID_FILE=/var/lib/tox-bootstrapd/pubkey.txt # These are some default nodes, but you can replace them with trusted nodes # as you prefer. See https://wiki.tox.im/Nodes TOX_NODE= @@ -5169,12 +5170,13 @@ function change_login_message { if [[ $SYSTEM_TYPE == "$VARIANT_DEVELOPER" ]]; then echo ' D E V E L O P E R E D I T I O N' >> /etc/motd fi - if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then - echo ' M E S H E D I T I O N' >> /etc/motd - fi echo '' >> /etc/motd - echo ' Freedom in the Cloud' >> /etc/motd + if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then + echo ' Freedom in the Cloud' >> /etc/motd + else + echo ' Freedom in the Mesh' >> /etc/motd + fi echo '' >> /etc/motd echo 'change_login_message' >> $COMPLETION_FILE } @@ -8284,6 +8286,9 @@ function install_tox_node { exit 6529 fi + # save the public key for later reference + echo "$TOX_PUBLIC_KEY" > $TOX_BOOTSTRAP_ID_FILE + configure_firewall_for_tox if ! grep -q "Tox node" /home/$MY_USERNAME/README; then