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" -*- +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" -*- +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 = \