|
@@ -163,7 +163,9 @@ function save_configuration_file {
|
163
|
163
|
echo "DDNS_PROVIDER=$DDNS_PROVIDER" >> $CONFIGURATION_FILE
|
164
|
164
|
echo "DDNS_USERNAME=$DDNS_USERNAME" >> $CONFIGURATION_FILE
|
165
|
165
|
echo "DDNS_PASSWORD=$DDNS_PASSWORD" >> $CONFIGURATION_FILE
|
166
|
|
- echo "MY_NAME=$MY_NAME" >> $CONFIGURATION_FILE
|
|
166
|
+ if [ $MY_NAME ]; then
|
|
167
|
+ echo "MY_NAME=$MY_NAME" >> $CONFIGURATION_FILE
|
|
168
|
+ fi
|
167
|
169
|
echo "MY_EMAIL_ADDRESS=$MY_EMAIL_ADDRESS" >> $CONFIGURATION_FILE
|
168
|
170
|
echo "LOCAL_NETWORK_STATIC_IP_ADDRESS=$LOCAL_NETWORK_STATIC_IP_ADDRESS" >> $CONFIGURATION_FILE
|
169
|
171
|
echo "ROUTER_IP_ADDRESS=$ROUTER_IP_ADDRESS" >> $CONFIGURATION_FILE
|
|
@@ -639,32 +641,26 @@ function interactive_configuration {
|
639
|
641
|
|
640
|
642
|
data=$(tempfile 2>/dev/null)
|
641
|
643
|
trap "rm -f $data" 0 1 2 5 15
|
642
|
|
- if [[ $INSTALLING_ON_BBB == "no" ]]; then
|
|
644
|
+ if [[ $INSTALLING_ON_BBB != "yes" ]]; then
|
643
|
645
|
dialog --backtitle "Freedombone Configuration" \
|
644
|
|
- --radiolist "Type of Random Number Generator:" 10 40 3 \
|
|
646
|
+ --radiolist "Type of Random Number Generator:" 10 40 2 \
|
645
|
647
|
1 Haveged on \
|
646
|
|
- 2 "Beaglebone built-in HRNG" off \
|
647
|
|
- 3 OneRNG off 2> $data
|
|
648
|
+ 2 OneRNG off 2> $data
|
|
649
|
+ sel=$?
|
|
650
|
+ case $sel in
|
|
651
|
+ 1) exit 1;;
|
|
652
|
+ 255) exit 1;;
|
|
653
|
+ esac
|
|
654
|
+ case $(cat $data) in
|
|
655
|
+ 2) HWRNG_TYPE="onerng"
|
|
656
|
+ dialog --title "OneRNG Device" \
|
|
657
|
+ --msgbox "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation" 8 60
|
|
658
|
+ ;;
|
|
659
|
+ 255) exit 1;;
|
|
660
|
+ esac
|
648
|
661
|
else
|
649
|
|
- dialog --backtitle "Freedombone Configuration" \
|
650
|
|
- --radiolist "Type of Random Number Generator:" 10 40 3 \
|
651
|
|
- 1 Haveged off \
|
652
|
|
- 2 "Beaglebone built-in HRNG" on \
|
653
|
|
- 3 OneRNG off 2> $data
|
|
662
|
+ HWRNG_TYPE="beaglebone"
|
654
|
663
|
fi
|
655
|
|
- sel=$?
|
656
|
|
- case $sel in
|
657
|
|
- 1) exit 1;;
|
658
|
|
- 255) exit 1;;
|
659
|
|
- esac
|
660
|
|
- case $(cat $data) in
|
661
|
|
- 2) HWRNG_TYPE="beaglebone";;
|
662
|
|
- 3) HWRNG_TYPE="onerng"
|
663
|
|
- dialog --title "OneRNG Device" \
|
664
|
|
- --msgbox "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation" 8 60
|
665
|
|
- ;;
|
666
|
|
- 255) exit 1;;
|
667
|
|
- esac
|
668
|
664
|
save_configuration_file
|
669
|
665
|
|
670
|
666
|
data=$(tempfile 2>/dev/null)
|
|
@@ -938,20 +934,22 @@ function interactive_configuration {
|
938
|
934
|
save_configuration_file
|
939
|
935
|
fi
|
940
|
936
|
|
941
|
|
- while [ ! $MY_NAME ]
|
942
|
|
- do
|
943
|
|
- data=$(tempfile 2>/dev/null)
|
944
|
|
- trap "rm -f $data" 0 1 2 5 15
|
945
|
|
- dialog --backtitle "Freedombone Configuration" \
|
946
|
|
- --inputbox "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
947
|
|
- sel=$?
|
948
|
|
- case $sel in
|
949
|
|
- 0) MY_NAME=$(cat $data);;
|
950
|
|
- 1) exit 1;;
|
951
|
|
- 255) exit 1;;
|
952
|
|
- esac
|
953
|
|
- done
|
954
|
|
- save_configuration_file
|
|
937
|
+ if [[ $SYSTEM_TYPE != $VARIANT_MESH ]]; then
|
|
938
|
+ while [ ! $MY_NAME ]
|
|
939
|
+ do
|
|
940
|
+ data=$(tempfile 2>/dev/null)
|
|
941
|
+ trap "rm -f $data" 0 1 2 5 15
|
|
942
|
+ dialog --backtitle "Freedombone Configuration" \
|
|
943
|
+ --inputbox "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
|
|
944
|
+ sel=$?
|
|
945
|
+ case $sel in
|
|
946
|
+ 0) MY_NAME=$(cat $data);;
|
|
947
|
+ 1) exit 1;;
|
|
948
|
+ 255) exit 1;;
|
|
949
|
+ esac
|
|
950
|
+ done
|
|
951
|
+ save_configuration_file
|
|
952
|
+ fi
|
955
|
953
|
|
956
|
954
|
if [ ! $LOCAL_NETWORK_STATIC_IP_ADDRESS ]; then
|
957
|
955
|
LOCAL_NETWORK_STATIC_IP_ADDRESS=$(grep 'LOCAL_NETWORK_STATIC_IP_ADDRESS' temp.cfg | awk -F '=' '{print $2}')
|