From d38b7b059afae171045e0cf0494caa24434085c0 Mon Sep 17 00:00:00 2001 From: Rick Box Date: Mon, 20 Feb 2017 15:32:15 +0000 Subject: [PATCH] Adds in option to disable overriding of apt-sources list By default AIO deploy overrides apt-sources, if things like a local mirror are already set up then this script will override these. This option allows for the override to be disabled. Change-Id: Id84c2c5d12153125d7ac6698493c41a840993c5b --- multi-node-aio/setup-host.sh | 56 ++++++++++++++++++++---------------- multi-node-aio/variables.sh | 5 ++++ 2 files changed, 37 insertions(+), 24 deletions(-) diff --git a/multi-node-aio/setup-host.sh b/multi-node-aio/setup-host.sh index df2dc85a..7ef85acd 100755 --- a/multi-node-aio/setup-host.sh +++ b/multi-node-aio/setup-host.sh @@ -17,6 +17,9 @@ set -eu # Load all functions source functions.rc +# bring in variable definitions if there is a variables.sh file +[[ -f variables.sh ]] && source variables.sh + # Make the rekick function part of the main general shell declare -f rekick_vms | tee /root/.functions.rc declare -f ssh_agent_reset | tee -a /root/.functions.rc @@ -98,33 +101,38 @@ if [[ "${PARTITION_HOST}" = true ]]; then mount -a fi -cat > /etc/apt/sources.list < /etc/apt/sources.list < /tmp/sources.list < /tmp/sources.list < /etc/apt/apt.conf.d/00-nokey <