free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use install_tox

This commit is contained in:
Bob Mottram 2016-07-12 15:11:45 +01:00
parent fcbffbe4d1
commit b4e2ad3fa1
No known key found for this signature in database
GPG Key ID: BA68F26108DC9F87
3 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/freedombone-image
View File

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

6
src/freedombone-image-customise
View File

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

12
src/freedombone-image-make
View File

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