use install_tox

src/freedombone-image

@@ -358,8 +358,8 @@ fi
 
 cd $TEMPBUILD_DIR
 make $IMAGE_TYPE \
-	 MY_USERNAME="$USERNAME" \
-	 MY_PASSWORD="$PASSWORD" \
+	 MYUSERNAME="$USERNAME" \
+	 MYPASSWORD="$PASSWORD" \
 	 ROUTER_IP_ADDRESS="$ROUTER_IP_ADDRESS" \
 	 BOX_IP_ADDRESS="$BOX_IP_ADDRESS" \
 	 NAMESERVER1="$NAMESERVER1" \

src/freedombone-image-customise

@@ -523,7 +523,7 @@ initialise_mesh() {
 	configure_firewall
 	install_avahi
 	install_batman
-	install_tox_node
+	install_tox
 	install_web_server
 	install_zeronet
 
@@ -701,6 +701,10 @@ export LC_ALL=C LANGUAGE=C LANG=C
 # are not created yet.
 export TMP=/tmp/ TMPDIR=/tmp/
 
+if [ ! $MY_USERNAME ]; then
+	echo $'No username was specified'
+	exit 52825
+fi
 username=$MY_USERNAME
 echo $"warning: creating initial user $username with well known password!"
 password=$MY_PASSWORD

src/freedombone-image-make

@@ -47,8 +47,8 @@ export ARCHITECTURE
 export MACHINE
 export SOURCE
 export SUITE
-export MY_USERNAME
-export MY_PASSWORD
+export MYUSERNAME
+export MYPASSWORD
 export ROUTER_IP_ADDRESS
 export BOX_IP_ADDRESS
 export NAMESERVER1
@@ -194,8 +194,12 @@ fi
 
 echo $'Changing values within customised customisation script'
 cp $PROJECT_INSTALL_DIR/${PROJECT_NAME}-image-customise $TEMP_CUSTOMISE3
-sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MY_USERNAME}|g" $TEMP_CUSTOMISE3
-sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MY_PASSWORD}|g" $TEMP_CUSTOMISE3
+if [ $MYUSERNAME ]; then
+	sed -i "s|MY_USERNAME=.*|MY_USERNAME=${MYUSERNAME}|g" $TEMP_CUSTOMISE3
+fi
+if [ $MYPASSWORD ]; then
+	sed -i "s|MY_PASSWORD=.*|MY_PASSWORD=${MYPASSWORD}|g" $TEMP_CUSTOMISE3
+fi
 sed -i "s|ROUTER_IP_ADDRESS=.*|ROUTER_IP_ADDRESS=${ROUTER_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
 sed -i "s|BOX_IP_ADDRESS=.*|BOX_IP_ADDRESS=${BOX_IP_ADDRESS}|g" $TEMP_CUSTOMISE3
 sed -i "s|NAMESERVER1=.*|NAMESERVER1=${NAMESERVER1}|g" $TEMP_CUSTOMISE3