From 3f5598f63bd4b9ac0d4af1e0139500640f901afe Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 22 Jul 2016 13:15:18 +0100 Subject: [PATCH] More mesh amnesia --- man/freedombone-image.1.gz | Bin 3377 -> 3498 bytes src/freedombone-image | 11 ++++++++++- src/freedombone-image-customise | 11 ++++++++++- src/freedombone-image-make | 2 ++ 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/man/freedombone-image.1.gz b/man/freedombone-image.1.gz index 9e85f2d5374d46177c26d1df9faf741ad68fda09..0ed01bb2b2bce5ea6d8c58efca4fd28c68a84648 100644 GIT binary patch literal 3498 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 Y@mudz@+x%y5BG}x3+n=leQ6*7035%+V*mgE literal 3377 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 $MESH_SETUP_DAEMON echo 'Description=Initial mesh router configuration' >> $MESH_SETUP_DAEMON echo 'After=syslog.target' >> $MESH_SETUP_DAEMON @@ -545,7 +554,7 @@ initialise_mesh() { echo 'User=root' >> $MESH_SETUP_DAEMON echo 'Group=root' >> $MESH_SETUP_DAEMON echo 'WorkingDirectory=/root' >> $MESH_SETUP_DAEMON - echo "ExecStart=/usr/local/bin/${PROJECT_NAME}-image-mesh ${MY_USERNAME} > /var/log/mesh-setup.log" >> $MESH_SETUP_DAEMON + echo "ExecStart=/usr/local/bin/${PROJECT_NAME}-image-mesh ${MESH_STARTUP_PARAMS} > /var/log/mesh-setup.log" >> $MESH_SETUP_DAEMON echo '' >> $MESH_SETUP_DAEMON echo 'TimeoutSec=99999' >> $MESH_SETUP_DAEMON echo '' >> $MESH_SETUP_DAEMON diff --git a/src/freedombone-image-make b/src/freedombone-image-make index 5df12f00..52fb1c7b 100755 --- a/src/freedombone-image-make +++ b/src/freedombone-image-make @@ -71,6 +71,7 @@ export WIFI_NETWORKS_FILE export VARIANT export MINIMUM_PASSWORD_LENGTH export INSECURE +export AMNESIC # Locate vmdebootstrap program fetched in Makefile basedir=`pwd` @@ -222,6 +223,7 @@ sed -i "s|WIFI_NETWORKS_FILE=.*|WIFI_NETWORKS_FILE=\"${WIFI_NETWORKS_FILE}\"|g" sed -i "s|VARIANT=.*|VARIANT=\"${VARIANT}\"|g" $TEMP_CUSTOMISE3 sed -i "s|MINIMUM_PASSWORD_LENGTH=.*|MINIMUM_PASSWORD_LENGTH=\"${MINIMUM_PASSWORD_LENGTH}\"|g" $TEMP_CUSTOMISE3 sed -i "s|INSECURE=.*|INSECURE=\"${INSECURE}\"|g" $TEMP_CUSTOMISE3 +sed -i "s|AMNESIC=.*|AMNESIC=\"${AMNESIC}\"|g" $TEMP_CUSTOMISE3 sed -i 's|#!/bin/bash||g' $TEMP_CUSTOMISE3 cat $TEMP_CUSTOMISE2 $TEMP_CUSTOMISE3 > $TEMP_CUSTOMISE4