summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-14 15:21:25 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-02-14 15:21:25 +0000
commitc3c6d9834ac10caf402222ac6d04a130df5bfbbc (patch)
tree6bcc1b052f0fc5b034eb786e8e0a890acb7471cb
parentff853d19a8a3c184eddee80acbe5c8d3db036470 (diff)
downloadtbdiff-c3c6d9834ac10caf402222ac6d04a130df5bfbbc.tar.gz
HACK to baserock-system-config-sync to make the tests works
-rwxr-xr-xbaserock-system-config-sync/baserock-system-config-sync2
1 files changed, 1 insertions, 1 deletions
diff --git a/baserock-system-config-sync/baserock-system-config-sync b/baserock-system-config-sync/baserock-system-config-sync
index b704f59..e768a3a 100755
--- a/baserock-system-config-sync/baserock-system-config-sync
+++ b/baserock-system-config-sync/baserock-system-config-sync
@@ -177,7 +177,7 @@ if [ "$1" = "merge" ]; then
usage "$0"
fi
new_version="$2"
- old_version=$(snapshot-mgr get-running)
+ old_version=$(snapshot-mgr get-default)
mounting_point=$(mktemp -d)
"$mounting_script" "$mounting_point"
if [ ! -d "$mounting_point/systems/$new_version" ]; then