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

Don't ask for RNG type when installing on Beaglebone Black, just use the HRNG

This commit is contained in:
Bob Mottram 2015-07-27 19:41:56 +01:00
parent 40b78a0f39
commit 3c84405f50
1 changed files with 35 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
src/freedombone-config
View File

@ -163,7 +163,9 @@ function save_configuration_file {
echo "DDNS_PROVIDER=$DDNS_PROVIDER" >> $CONFIGURATION_FILE echo "DDNS_PROVIDER=$DDNS_PROVIDER" >> $CONFIGURATION_FILE
echo "DDNS_USERNAME=$DDNS_USERNAME" >> $CONFIGURATION_FILE echo "DDNS_USERNAME=$DDNS_USERNAME" >> $CONFIGURATION_FILE
echo "DDNS_PASSWORD=$DDNS_PASSWORD" >> $CONFIGURATION_FILE echo "DDNS_PASSWORD=$DDNS_PASSWORD" >> $CONFIGURATION_FILE
echo "MY_NAME=$MY_NAME" >> $CONFIGURATION_FILE if [ $MY_NAME ]; then
echo "MY_NAME=$MY_NAME" >> $CONFIGURATION_FILE
fi
echo "MY_EMAIL_ADDRESS=$MY_EMAIL_ADDRESS" >> $CONFIGURATION_FILE echo "MY_EMAIL_ADDRESS=$MY_EMAIL_ADDRESS" >> $CONFIGURATION_FILE
echo "LOCAL_NETWORK_STATIC_IP_ADDRESS=$LOCAL_NETWORK_STATIC_IP_ADDRESS" >> $CONFIGURATION_FILE echo "LOCAL_NETWORK_STATIC_IP_ADDRESS=$LOCAL_NETWORK_STATIC_IP_ADDRESS" >> $CONFIGURATION_FILE
echo "ROUTER_IP_ADDRESS=$ROUTER_IP_ADDRESS" >> $CONFIGURATION_FILE echo "ROUTER_IP_ADDRESS=$ROUTER_IP_ADDRESS" >> $CONFIGURATION_FILE
@ -639,32 +641,26 @@ 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
if [[ $INSTALLING_ON_BBB == "no" ]]; then if [[ $INSTALLING_ON_BBB != "yes" ]]; then
dialog --backtitle "Freedombone Configuration" \ dialog --backtitle "Freedombone Configuration" \
--radiolist "Type of Random Number Generator:" 10 40 3 \ --radiolist "Type of Random Number Generator:" 10 40 2 \
1 Haveged on \ 1 Haveged on \
2 "Beaglebone built-in HRNG" off \ 2 OneRNG off 2> $data
3 OneRNG off 2> $data sel=$?
case $sel in
1) exit 1;;
255) exit 1;;
esac
case $(cat $data) in
2) HWRNG_TYPE="onerng"
dialog --title "OneRNG Device" \
--msgbox "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation" 8 60
;;
255) exit 1;;
esac
else else
dialog --backtitle "Freedombone Configuration" \ HWRNG_TYPE="beaglebone"
--radiolist "Type of Random Number Generator:" 10 40 3 \
1 Haveged off \
2 "Beaglebone built-in HRNG" on \
3 OneRNG off 2> $data
fi fi
sel=$?
case $sel in
1) exit 1;;
255) exit 1;;
esac
case $(cat $data) in
2) HWRNG_TYPE="beaglebone";;
3) HWRNG_TYPE="onerng"
dialog --title "OneRNG Device" \
--msgbox "Please ensure that the OneRNG device is disconnected. You can reconnect it later during the installation" 8 60
;;
255) exit 1;;
esac
save_configuration_file save_configuration_file
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
@ -938,20 +934,22 @@ function interactive_configuration {
save_configuration_file save_configuration_file
fi fi
while [ ! $MY_NAME ] if [[ $SYSTEM_TYPE != $VARIANT_MESH ]]; then
do while [ ! $MY_NAME ]
data=$(tempfile 2>/dev/null) do
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 "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data dialog --backtitle "Freedombone Configuration" \
sel=$? --inputbox "Your full name (or nick)" 10 30 "$(grep 'MY_NAME' temp.cfg | awk -F '=' '{print $2}')" 2> $data
case $sel in sel=$?
0) MY_NAME=$(cat $data);; case $sel in
1) exit 1;; 0) MY_NAME=$(cat $data);;
255) exit 1;; 1) exit 1;;
esac 255) exit 1;;
done esac
save_configuration_file done
save_configuration_file
fi
if [ ! $LOCAL_NETWORK_STATIC_IP_ADDRESS ]; then if [ ! $LOCAL_NETWORK_STATIC_IP_ADDRESS ]; then
LOCAL_NETWORK_STATIC_IP_ADDRESS=$(grep 'LOCAL_NETWORK_STATIC_IP_ADDRESS' temp.cfg | awk -F '=' '{print $2}') LOCAL_NETWORK_STATIC_IP_ADDRESS=$(grep 'LOCAL_NETWORK_STATIC_IP_ADDRESS' temp.cfg | awk -F '=' '{print $2}')