summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-02-25 18:09:05 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-02-26 16:40:26 (GMT)
commit9258025d1f1efb6feed384ec2907b07cf34dd5aa (patch)
tree955e2882c75d155553b3410d2d7950f29392ad7a
parent7ac781919ae61cfc66bc277edaa34749310b3fee (diff)
downloadtbdiff-9258025d1f1efb6feed384ec2907b07cf34dd5aa.tar.gz
system-version-manager: Allow specifying custom path for baserock-system-config-sync
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-manager9
1 files changed, 6 insertions, 3 deletions
diff --git a/system-version-manager/system-version-manager b/system-version-manager/system-version-manager
index 914138f..aac1b06 100755
--- a/system-version-manager/system-version-manager
+++ b/system-version-manager/system-version-manager
@@ -130,11 +130,14 @@ 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', self.current_system, label],
- stdout=f)
+ [baserock-system-config-sync, 'merge',
+ self.current_system, label], stdout=f)
self.status(msg="Installing the kernel")
self._install_kernel(version_root)