From ebf5844b4bfa9051d36b367f2adc46059621a60f Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob.mottram@codethink.co.uk>
Date: Mon, 11 Jan 2016 17:06:59 +0000
Subject: [PATCH] mesh install

---
 src/freedombone                 | 6 +++++-
 src/freedombone-image-customise | 3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/freedombone b/src/freedombone
index d8416e6a..307215dd 100755
--- a/src/freedombone
+++ b/src/freedombone
@@ -1235,6 +1235,7 @@ function read_configuration {
             TLS_TIME_SOURCE2=$(grep "TLS_TIME_SOURCE2" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
         fi
     fi
+	echo "System type: $SYSTEM_TYPE"
 }
 
 function set_default_onion_domains {
@@ -3447,6 +3448,9 @@ function change_debian_repos {
     if grep -Fxq "change_debian_repos" $COMPLETION_FILE; then
         return
     fi
+    if [[ $SYSTEM_TYPE == "$VARIANT_MESH" ]]; then
+        return
+    fi
     rm -rf /var/lib/apt/lists/*
     apt-get clean
     sed -i "s/ftp.us.debian.org/$DEBIAN_REPO/g" /etc/apt/sources.list
@@ -8407,7 +8411,7 @@ quit" > $INSTALL_DIR/batch.sql
     #echo "$config['db']['schemacheck'] = 'script';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
     #echo '' >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
     #echo "$config['site']['profile'] = 'community';" >> /var/www/${MICROBLOG_DOMAIN_NAME}/htdocs/config.php
-    
+
     MICROBLOG_ONION_HOSTNAME=$(add_onion_service microblog 80 ${MICROBLOG_ONION_PORT})
 
     systemctl restart php5-fpm
diff --git a/src/freedombone-image-customise b/src/freedombone-image-customise
index 47bd8766..833fadb4 100755
--- a/src/freedombone-image-customise
+++ b/src/freedombone-image-customise
@@ -341,7 +341,8 @@ continue_installation() {
     if [ $CONFIG_FILENAME ]; then
         if [ ${#CONFIG_FILENAME} -gt 2 ]; then
             cp $CONFIG_FILENAME $rootdir/root/$PROJECT_NAME.cfg
-            chroot $rootdir $PROJECT_NAME -c /root/$PROJECT_NAME.cfg
+            cat $rootdir/root/$PROJECT_NAME.cfg
+            chroot "$rootdir" $PROJECT_NAME -c /root/$PROJECT_NAME.cfg
         fi
     fi
 }