From d4ffd0d9b5e76f4e18c0cca6a7a3d4a764980c9e Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@robotics.uk.to>
Date: Sat, 31 Jan 2015 09:32:35 +0000
Subject: [PATCH] Mount point

---
 src/freedombone      |  4 ++++
 src/freedombone-prep | 18 ++++++++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index e90963ee..996aa33d 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1099,6 +1099,10 @@ function read_configuration {
   fi
 
   if [ -f $CONFIGURATION_FILE ]; then
+      if grep -q "DEBIAN_REPO" $CONFIGURATION_FILE; then
+          DEBIAN_REPO=$(grep "DEBIAN_REPO" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
+		  CHECK_MESSAGE="Check your internet connection, /etc/network/interfaces and /etc/resolv.conf, then delete $COMPLETION_FILE, run 'rm -fR /var/lib/apt/lists/* && apt-get update --fix-missing' and run this script again. If hash sum mismatches persist then try setting $DEBIAN_REPO to a different mirror and also change /etc/apt/sources.list."
+      fi
       if grep -q "VOIP_PORT" $CONFIGURATION_FILE; then
           VOIP_PORT=$(grep "VOIP_PORT" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
       fi
diff --git a/src/freedombone-prep b/src/freedombone-prep
index b402a7fc..6bd715c5 100755
--- a/src/freedombone-prep
+++ b/src/freedombone-prep
@@ -63,16 +63,14 @@ fi
 
 if [ ! -d $MICROSD_MOUNT_POINT ]; then
     if [ -d /media ]; then
-        if [ ! -d /media/$ROOTFS ]; then
-            # different directories for Debian
-            if [ -d /media/usb1/home ]; then
-                MICROSD_MOUNT_POINT=/media
-                ROOTFS=usb1
-            fi
-            if [ -f /media/usb0/bbb-uEnv.txt ]; then
-                MICROSD_MOUNT_POINT=/media
-                BOOT=usb0
-            fi
+        # different directories for Debian
+        if [ -d /media/usb1 ]; then
+            MICROSD_MOUNT_POINT=/media
+            ROOTFS=usb1
+        fi
+        if [ -d /media/usb0 ]; then
+            MICROSD_MOUNT_POINT=/media
+            BOOT=usb0
         fi
     fi
     if [ ! -d $MICROSD_MOUNT_POINT ]; then