From 2bce42cb1484d3157337e6566a9347042db48aa2 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 31 Aug 2015 18:33:08 +0100 Subject: [PATCH] For now only use Batman until other mesh types are tested --- src/freedombone-config | 36 ++++++++++++++++++------------------ src/freedombone-prep | 2 +- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/freedombone-config b/src/freedombone-config index 49f497bd..884d8316 100755 --- a/src/freedombone-config +++ b/src/freedombone-config @@ -521,27 +521,27 @@ function interactive_configuration { save_configuration_file if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then - ENABLE_BATMAN="no" + ENABLE_BATMAN="yes" ENABLE_CJDNS="no" ENABLE_BABEL="no" - data=$(tempfile 2>/dev/null) - trap "rm -f $data" 0 1 2 5 15 - dialog --backtitle "Freedombone Configuration" \ - --radiolist "Select your type of mesh network:" 10 40 3 \ - 1 "Babel" off \ - 2 "B.A.T.M.A.N. Advanced" on \ - 3 "cjdns" off 2> $data - sel=$? - case $sel in - 1) exit 1;; - 255) exit 1;; - esac - case $(cat $data) in - 1) ENABLE_BABEL="yes";; - 2) ENABLE_BATMAN="yes";; - 3) ENABLE_CJDNS="yes";; - esac + #data=$(tempfile 2>/dev/null) + #trap "rm -f $data" 0 1 2 5 15 + #dialog --backtitle "Freedombone Configuration" \ + # --radiolist "Select your type of mesh network:" 10 40 3 \ + # 1 "Babel" off \ + # 2 "B.A.T.M.A.N. Advanced" on \ + # 3 "cjdns" off 2> $data + #sel=$? + #case $sel in + # 1) exit 1;; + # 255) exit 1;; + #esac + #case $(cat $data) in + # 1) ENABLE_BABEL="yes";; + # 2) ENABLE_BATMAN="yes";; + # 3) ENABLE_CJDNS="yes";; + #esac save_configuration_file data=$(tempfile 2>/dev/null) diff --git a/src/freedombone-prep b/src/freedombone-prep index 790a5fd3..a1e999d3 100755 --- a/src/freedombone-prep +++ b/src/freedombone-prep @@ -56,7 +56,7 @@ DEBIAN_FILE_NAME="bone-debian-8.1-console-armhf-2015-07-12-2gb" # Downloads for the Debian installer DOWNLOAD_LINK1="https://rcn-ee.com/rootfs/bb.org/testing/2015-07-12/console/$DEBIAN_FILE_NAME.img.xz" -ROOTFS='bbb' +ROOTFS='rootfs' PARTITION_NUMBER=1