summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-02-25 18:09:05 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-03-05 11:44:51 +0000
commit3b69bc7d881e04b16915e315eb42c3da5358fd7c (patch)
treef30319c6906591376111ddf4a6e62493826a6926
parent1c176afdba5650c37d97fc1dedc0438dd4621f5e (diff)
downloadtbdiff-3b69bc7d881e04b16915e315eb42c3da5358fd7c.tar.gz
system-version-manager: Allow specifying custom path for baserock-system-config-syncbaserock/pedroalvarez/trove-upgrades-rebase
This is helpful when deploying an upgrade to a system that doesn't already have baserock-system-config-sync installed.
-rwxr-xr-xsystem-version-manager/system-version-manager6
1 files changed, 5 insertions, 1 deletions
diff --git a/system-version-manager/system-version-manager b/system-version-manager/system-version-manager
index d6b2342..85ab351 100755
--- a/system-version-manager/system-version-manager
+++ b/system-version-manager/system-version-manager
@@ -190,9 +190,13 @@ class SystemVersionManager(object):
self.status(msg='Updating system configuration')
log = os.path.join('/var', 'log', 'baserock-system-config-sync.log')
+ baserock_system_config_sync = os.environ.get(
+ 'BASEROCK_SYSTEM_CONFIG_SYNC',
+ 'baserock-system-config-sync')
+
with open(log, 'w') as f:
subprocess.check_call(
- ['baserock-system-config-sync', 'merge',
+ [baserock-system-config-sync, 'merge',
self.current_system, label], stdout=f)
# Copy the content of /var of the system deployed.