diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-02-25 18:09:05 +0000 |
---|---|---|
committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2014-03-06 16:50:21 +0000 |
commit | 1db1e045a3ce3d505718572ca14546bb4273e7a3 (patch) | |
tree | 20203fdb48138d1cb2fb1530ec765c5faa04bbdd | |
parent | 3ff52dc3935ae52b5b633a98eec1eb1ff3be0f29 (diff) | |
download | tbdiff-1db1e045a3ce3d505718572ca14546bb4273e7a3.tar.gz |
system-version-manager: Allow specifying custom path for baserock-system-config-syncbaserock/pedroalvarez/trove-upgrades-rebase2
This is helpful when deploying an upgrade to a system that doesn't
already have baserock-system-config-sync installed.
-rwxr-xr-x | system-version-manager/system-version-manager | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/system-version-manager/system-version-manager b/system-version-manager/system-version-manager index 261333b..6638a35 100755 --- a/system-version-manager/system-version-manager +++ b/system-version-manager/system-version-manager @@ -192,9 +192,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. |