|
@@ -90,7 +90,9 @@ MEDIAGOBLIN_CODE=
|
90
|
90
|
USB_DRIVE=/dev/sdb1
|
91
|
91
|
HWRNG_TYPE=
|
92
|
92
|
ENABLE_SOCIAL_KEY_MANAGEMENT=
|
93
|
|
-
|
|
93
|
+ESSID='mesh'
|
|
94
|
+BATMAN_CELLID='02:BA:00:00:03:01'
|
|
95
|
+WIFI_CHANNEL=
|
94
|
96
|
CONFIGURATION_FILE=
|
95
|
97
|
|
96
|
98
|
function show_help {
|
|
@@ -231,6 +233,15 @@ function save_configuration_file {
|
231
|
233
|
if [ $ENABLE_SOCIAL_KEY_MANAGEMENT ]; then
|
232
|
234
|
echo "ENABLE_SOCIAL_KEY_MANAGEMENT=$ENABLE_SOCIAL_KEY_MANAGEMENT" >> $CONFIGURATION_FILE
|
233
|
235
|
fi
|
|
236
|
+ if [ $ESSID ]; then
|
|
237
|
+ echo "ESSID=$ESSID" >> $CONFIGURATION_FILE
|
|
238
|
+ fi
|
|
239
|
+ if [ $BATMAN_CELLID ]; then
|
|
240
|
+ echo "BATMAN_CELLID=$BATMAN_CELLID" >> $CONFIGURATION_FILE
|
|
241
|
+ fi
|
|
242
|
+ if [ $WIFI_CHANNEL ]; then
|
|
243
|
+ echo "WIFI_CHANNEL=$WIFI_CHANNEL" >> $CONFIGURATION_FILE
|
|
244
|
+ fi
|
234
|
245
|
}
|
235
|
246
|
|
236
|
247
|
# test a domain name to see if it's valid
|
|
@@ -526,6 +537,30 @@ function interactive_configuration {
|
526
|
537
|
3) ENABLE_CJDNS="yes";;
|
527
|
538
|
esac
|
528
|
539
|
save_configuration_file
|
|
540
|
+
|
|
541
|
+ data=$(tempfile 2>/dev/null)
|
|
542
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
543
|
+ dialog --backtitle "Freedombone Configuration" \
|
|
544
|
+ --inputbox "Wireless Mesh ESSID\n\nIf you press enter the default will be '$ESSID'" 10 40 "$(grep 'ESSID' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
545
|
+ sel=$?
|
|
546
|
+ case $sel in
|
|
547
|
+ 0) ESSID=$(cat $data);;
|
|
548
|
+ 1) exit 1;;
|
|
549
|
+ 255) exit 1;;
|
|
550
|
+ esac
|
|
551
|
+ fi
|
|
552
|
+
|
|
553
|
+ if [[ $ENABLE_BATMAN == "yes" ]]; then
|
|
554
|
+ data=$(tempfile 2>/dev/null)
|
|
555
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
556
|
+ dialog --backtitle "Freedombone Configuration" \
|
|
557
|
+ --inputbox "Wireless Mesh cell ID\n\nIf you press enter the default will be $BATMAN_CELLID" 10 40 "$(grep 'BATMAN_CELLID' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
558
|
+ sel=$?
|
|
559
|
+ case $sel in
|
|
560
|
+ 0) BATMAN_CELLID=$(cat $data);;
|
|
561
|
+ 1) exit 1;;
|
|
562
|
+ 255) exit 1;;
|
|
563
|
+ esac
|
529
|
564
|
fi
|
530
|
565
|
|
531
|
566
|
data=$(tempfile 2>/dev/null)
|
|
@@ -1470,6 +1505,15 @@ function read_configuration {
|
1470
|
1505
|
if grep -q "MEDIAGOBLIN_CODE" $CONFIGURATION_FILE; then
|
1471
|
1506
|
MEDIAGOBLIN_CODE=$(grep "MEDIAGOBLIN_CODE" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
1472
|
1507
|
fi
|
|
1508
|
+ if grep -q "ESSID" $CONFIGURATION_FILE; then
|
|
1509
|
+ ESSID=$(grep "ESSID" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1510
|
+ fi
|
|
1511
|
+ if grep -q "BATMAN_CELLID" $CONFIGURATION_FILE; then
|
|
1512
|
+ BATMAN_CELLID=$(grep "BATMAN_CELLID" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1513
|
+ fi
|
|
1514
|
+ if grep -q "WIFI_CHANNEL" $CONFIGURATION_FILE; then
|
|
1515
|
+ WIFI_CHANNEL=$(grep "WIFI_CHANNEL" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
1516
|
+ fi
|
1473
|
1517
|
fi
|
1474
|
1518
|
}
|
1475
|
1519
|
|