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

Split mesh installs into two categories

This commit is contained in:
Bob Mottram 2015-09-05 10:46:52 +01:00
parent ed52903b5d
commit a7ae622535
2 changed files with 74 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/freedombone
View File

@ -507,12 +507,20 @@ function interactive_configuration {
exit 63935 exit 63935
fi fi
fi fi
if [ -f /tmp/meshuserdevice ]; then
rm -f /tmp/meshuserdevice
fi
freedombone-config \ freedombone-config \
-f $CONFIGURATION_FILE \ -f $CONFIGURATION_FILE \
-w $FREEDOMBONE_WEBSITE \ -w $FREEDOMBONE_WEBSITE \
-b $FREEDOMBONE_BITMESSAGE \ -b $FREEDOMBONE_BITMESSAGE \
-m $MINIMUM_PASSWORD_LENGTH -m $MINIMUM_PASSWORD_LENGTH
if [ -f /tmp/meshuserdevice ]; then
# mesh network installation
rm -f /tmp/meshuserdevice
exit 0
fi
if [ ! "$?" = "0" ]; then if [ ! "$?" = "0" ]; then
echo 'Command failed:' echo 'Command failed:'
echo '' echo ''

94
src/freedombone-config
View File

@ -52,6 +52,7 @@ VARIANT_SOCIAL="social"
VARIANT_MEDIA="media" VARIANT_MEDIA="media"
VARIANT_DEVELOPER="developer" VARIANT_DEVELOPER="developer"
VARIANT_MESH="mesh" VARIANT_MESH="mesh"
VARIANT_MESH_USER="mesh-user"
MY_USERNAME= MY_USERNAME=
DEFAULT_DOMAIN_NAME= DEFAULT_DOMAIN_NAME=
@ -490,7 +491,7 @@ function interactive_configuration {
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15 trap "rm -f $data" 0 1 2 5 15
dialog --backtitle "Freedombone Configuration" \ dialog --backtitle "Freedombone Configuration" \
--radiolist "Type of Installation:" 17 40 10 \ --radiolist "Type of Installation:" 18 40 11 \
1 Full on \ 1 Full on \
2 Writer off \ 2 Writer off \
3 Cloud off \ 3 Cloud off \
@ -500,7 +501,8 @@ function interactive_configuration {
7 Social off \ 7 Social off \
8 Media off \ 8 Media off \
9 Developer off \ 9 Developer off \
10 Mesh off 2> $data 10 "Mesh (router)" off \
11 "Mesh (user device)" off 2> $data
sel=$? sel=$?
case $sel in case $sel in
1) exit 1;; 1) exit 1;;
@ -517,10 +519,11 @@ function interactive_configuration {
8) SYSTEM_TYPE=$VARIANT_MEDIA;; 8) SYSTEM_TYPE=$VARIANT_MEDIA;;
9) SYSTEM_TYPE=$VARIANT_DEVELOPER;; 9) SYSTEM_TYPE=$VARIANT_DEVELOPER;;
10) SYSTEM_TYPE=$VARIANT_MESH;; 10) SYSTEM_TYPE=$VARIANT_MESH;;
11) SYSTEM_TYPE=$VARIANT_MESH_USER;;
esac esac
save_configuration_file save_configuration_file
if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_MESH" || $SYSTEM_TYPE == "$VARIANT_MESH_USER" ]]; then
ENABLE_BATMAN="yes" ENABLE_BATMAN="yes"
ENABLE_CJDNS="no" ENABLE_CJDNS="no"
ENABLE_BABEL="no" ENABLE_BABEL="no"
@ -556,31 +559,66 @@ function interactive_configuration {
esac esac
save_configuration_file save_configuration_file
data=$(tempfile 2>/dev/null) if [[ $SYSTEM_TYPE != "$VARIANT_MESH_USER" ]]; then
trap "rm -f $data" 0 1 2 5 15 data=$(tempfile 2>/dev/null)
dialog --backtitle "Freedombone Configuration" \ trap "rm -f $data" 0 1 2 5 15
--inputbox "Give your mesh peer a name" 10 40 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data dialog --backtitle "Freedombone Configuration" \
sel=$? --inputbox "Give your mesh peer a name" 10 40 "$(grep 'DEFAULT_DOMAIN_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
case $sel in sel=$?
0) DEFAULT_DOMAIN_NAME=$(cat $data);; case $sel in
1) exit 1;; 0) DEFAULT_DOMAIN_NAME=$(cat $data);;
255) exit 1;; 1) exit 1;;
esac 255) exit 1;;
esac
else
DEFAULT_DOMAIN_NAME=$(hostname)
fi
save_configuration_file save_configuration_file
fi fi
if [[ $ENABLE_BATMAN == "yes" ]]; then #if [[ $ENABLE_BATMAN == "yes" ]]; then
data=$(tempfile 2>/dev/null) # data=$(tempfile 2>/dev/null)
trap "rm -f $data" 0 1 2 5 15 # trap "rm -f $data" 0 1 2 5 15
dialog --backtitle "Freedombone Configuration" \ # dialog --backtitle "Freedombone Configuration" \
--inputbox "Optionally register with an Access Point" 10 40 "$(grep 'BATMAN_CELLID' temp.cfg | awk -F '=' '{print $2}')" 2> $data # --inputbox "Optionally register with an Access Point" 10 40 "$(grep 'BATMAN_CELLID' temp.cfg | awk -F '=' '{print $2}')" 2> $data
sel=$? # sel=$?
case $sel in # case $sel in
0) BATMAN_CELLID=$(cat $data);; # 0) BATMAN_CELLID=$(cat $data);;
1) exit 1;; # 1) exit 1;;
255) exit 1;; # 255) exit 1;;
esac # esac
save_configuration_file # save_configuration_file
#fi
if [[ $SYSTEM_TYPE == "$VARIANT_MESH_USER" ]]; then
freedombone-client
if [ "$?" = "0" ]; then
clear
echo ".---. . . "
echo "| | | "
echo "|--- .--. .-. .-. .-.| .-. .--.--. |.-. .-. .--. .-. "
echo "| | (.-' (.-' ( | ( )| | | | )( )| | (.-' "
echo "' ' --' --' -' - -' ' ' -' -' -' ' - --'"
echo ''
echo 'Your system is now ready for connection to the mesh network'
echo ''
echo 'To connect to the network open a terminal and type:'
echo ''
echo ' meshweb'
echo ''
echo 'To disconnect from the mesh and return to the internet type:'
echo ''
echo ' sudo batman stop'
echo ''
echo 'To turn your system into a dedicated mesh peer you could add'
echo 'the meshweb command to your startup applications'
echo ''
touch /tmp/meshuserdevice
exit 0
else
echo 'Failed to fully install the mesh networking system'
exit 74589
fi
fi fi
if [[ $SYSTEM_TYPE == "$VARIANT_MESH" && $DEFAULT_DOMAIN_NAME && -d /home/$DEFAULT_DOMAIN_NAME ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_MESH" && $DEFAULT_DOMAIN_NAME && -d /home/$DEFAULT_DOMAIN_NAME ]]; then
@ -635,9 +673,9 @@ function interactive_configuration {
esac esac
if [[ $INSTALLING_ON_BBB == "yes" ]]; then if [[ $INSTALLING_ON_BBB == "yes" ]]; then
USB_DRIVE=/dev/sda1 USB_DRIVE=/dev/sda1
# here a short diffie-hellman key length is used, because otherwise creation of keys # here a short diffie-hellman key length is used, because otherwise creation of keys
# becomes impractically long on the beaglebone. # becomes impractically long on the beaglebone.
DH_KEYLENGTH=1024 DH_KEYLENGTH=1024
fi fi
save_configuration_file save_configuration_file