From 1e21651e1ea4b682ca46b7bb941503b9bbeb462d Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Mon, 1 Aug 2016 12:13:44 +0200
Subject: [PATCH] In CRL Core, in alliance.conf use ALLIANCE_TOP environement
 variable if set.

---
 crlcore/etc/cmos/alliance.conf           | 12 ++++++++++--
 crlcore/etc/scmos_deep_018/alliance.conf | 12 ++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/crlcore/etc/cmos/alliance.conf b/crlcore/etc/cmos/alliance.conf
index 5e937d65..6aa44284 100644
--- a/crlcore/etc/cmos/alliance.conf
+++ b/crlcore/etc/cmos/alliance.conf
@@ -1,11 +1,19 @@
 # -*- Mode:Python; explicit-buffer-name: "alliance.conf<cmos>" -*-
 
+import os
 from helpers.Alliance import AddMode
 from helpers.Alliance import Gauge
 
 
-allianceTop    = '/soc/alliance'
-cellsTop       = allianceTop+'/cells/'
+allianceTop = None
+if os.environ.has_key['ALLIANCE_TOP']:
+  allianceTop = os.environ['ALLIANCE_TOP']
+  if not os.path.isdir(allianceTop):
+    allianceTop = None
+
+if not allianceTop: allianceTop = '/soc/alliance'
+
+cellsTop = allianceTop+'/cells/'
 
 
 allianceConfig = \
diff --git a/crlcore/etc/scmos_deep_018/alliance.conf b/crlcore/etc/scmos_deep_018/alliance.conf
index 32c1b9a8..0a03952c 100644
--- a/crlcore/etc/scmos_deep_018/alliance.conf
+++ b/crlcore/etc/scmos_deep_018/alliance.conf
@@ -1,11 +1,19 @@
 # -*- Mode:Python; explicit-buffer-name: "alliance.conf<scmos_deep_018>" -*-
 
+import os
 from helpers.Alliance import AddMode
 from helpers.Alliance import Gauge
 
 
-allianceTop    = '/soc/alliance'
-cellsTop       = allianceTop+'/cells'
+allianceTop = None
+if os.environ.has_key['ALLIANCE_TOP']:
+  allianceTop = os.environ['ALLIANCE_TOP']
+  if not os.path.isdir(allianceTop):
+    allianceTop = None
+
+if not allianceTop: allianceTop = '/soc/alliance'
+
+cellsTop = allianceTop+'/cells/'
 
 
 allianceConfig = \