From f3352d2907355b03ba9946abc9007e7259cb3689 Mon Sep 17 00:00:00 2001
From: Pedro Alvarez <pedro.alvarez@codethink.co.uk>
Date: Tue, 18 Nov 2014 12:29:09 +0000
Subject: Check Mason variables after installing Mason files

This way, if the Mason system that is being deployed is generic,
it will contain the files needed to setup and run Mason.
---
 mason.configure | 58 ++++++++++++++++++++++++++++-----------------------------
 1 file changed, 28 insertions(+), 30 deletions(-)

diff --git a/mason.configure b/mason.configure
index 621d6a31..ec8bf7d8 100644
--- a/mason.configure
+++ b/mason.configure
@@ -32,36 +32,6 @@
 
 set -e
 
-
-##########################################################################
-# Check variables
-##########################################################################
-
-if [ -n "$MASON_GENERIC" ]; then
-    echo Not configuring Mason, it will be generic
-    exit 0
-fi
-
-if [ -z "$MASON_CLUSTER_MORPHOLOGY" -a \
-     -z "$MASON_DEFINITIONS_REF" -a \
-     -z "$MASON_DISTBUILD_ARCH" -a \
-     -z "$MASON_TEST_HOST" ]; then
-    # No Mason options defined, do nothing.
-    exit 0
-fi
-
-if [ -z "$ARTIFACT_CACHE_SERVER" -o \
-     -z "$CONTROLLERHOST" -o \
-     -z "$MASON_CLUSTER_MORPHOLOGY" -o \
-     -z "$MASON_DEFINITIONS_REF" -o \
-     -z "$MASON_DISTBUILD_ARCH" -o \
-     -z "$MASON_TEST_HOST" -o \
-     -z "$TROVE_HOST" -o \
-     -z "$TROVE_ID" ]; then
-    echo Some options required for Mason were defined, but not all.
-    exit 1
-fi
-
 ##########################################################################
 # Copy Mason files into root filesystem
 ##########################################################################
@@ -104,6 +74,34 @@ cp mason/mason-setup.service "$ROOT"/etc/systemd/system/mason-setup.service
 
 ln -s ../mason-setup.service "$ROOT"/etc/systemd/system/multi-user.target.wants/mason-setup.service
 
+##########################################################################
+# Check variables
+##########################################################################
+
+if [ -n "$MASON_GENERIC" ]; then
+    echo Not configuring Mason, it will be generic
+    exit 0
+fi
+
+if [ -z "$MASON_CLUSTER_MORPHOLOGY" -a \
+     -z "$MASON_DEFINITIONS_REF" -a \
+     -z "$MASON_DISTBUILD_ARCH" -a \
+     -z "$MASON_TEST_HOST" ]; then
+    # No Mason options defined, do nothing.
+    exit 0
+fi
+
+if [ -z "$ARTIFACT_CACHE_SERVER" -o \
+     -z "$CONTROLLERHOST" -o \
+     -z "$MASON_CLUSTER_MORPHOLOGY" -o \
+     -z "$MASON_DEFINITIONS_REF" -o \
+     -z "$MASON_DISTBUILD_ARCH" -o \
+     -z "$MASON_TEST_HOST" -o \
+     -z "$TROVE_HOST" -o \
+     -z "$TROVE_ID" ]; then
+    echo Some options required for Mason were defined, but not all.
+    exit 1
+fi
 
 ##########################################################################
 # Generate config variable shell snippet
-- 
cgit v1.2.1