This commit is contained in:
Bob Mottram 2015-07-19 15:02:23 +01:00
parent 50b2b7860c
commit 04ba4cb690
1 changed files with 4 additions and 4 deletions

View File

@ -507,7 +507,7 @@ function interactive_configuration {
esac esac
save_configuration_file save_configuration_file
if [[ SYSTEM_TYPE == "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
ENABLE_BATMAN="yes" ENABLE_BATMAN="yes"
ENABLE_CJDNS="no" ENABLE_CJDNS="no"
fi fi
@ -562,7 +562,7 @@ function interactive_configuration {
fi fi
save_configuration_file save_configuration_file
if [[ SYSTEM_TYPE != "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
interactive_gpg interactive_gpg
data=$(tempfile 2>/dev/null) data=$(tempfile 2>/dev/null)
@ -806,7 +806,7 @@ function interactive_configuration {
esac esac
save_configuration_file save_configuration_file
if [[ SYSTEM_TYPE != "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; 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
@ -1241,7 +1241,7 @@ function interactive_configuration {
save_configuration_file save_configuration_file
fi fi
if [[ SYSTEM_TYPE != "$VARIANT_MESH" ]]; then if [[ $SYSTEM_TYPE != "$VARIANT_MESH" ]]; then
DEFAULT_DOMAIN_DETAILS_COMPLETE= DEFAULT_DOMAIN_DETAILS_COMPLETE=
while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ] while [ ! $DEFAULT_DOMAIN_DETAILS_COMPLETE ]
do do