diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-06-12 19:12:44 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-06-12 19:12:44 +0200 |
| commit | 2f7486d85b22ea0910283320248f7739fd0fcfd8 (patch) | |
| tree | f7c57f2022973735fb928591d95b888283ced0f5 /catlfish-dev | |
| parent | 13c837597d736366be5370cd6cdbcc5df94bf351 (diff) | |
Pass $MERGE_EXTRA_ARGS.
Diffstat (limited to 'catlfish-dev')
| -rwxr-xr-x | catlfish-dev/merge.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/catlfish-dev/merge.sh b/catlfish-dev/merge.sh index 7d9e9fe..4120ec2 100755 --- a/catlfish-dev/merge.sh +++ b/catlfish-dev/merge.sh @@ -25,7 +25,8 @@ while true; do date python /usr/local/src/catlfish/tools/merge.py \ --config /usr/local/etc/catlfish/${LOGNAME}.cfg \ - --localconfig /usr/local/etc/catlfish/${NODENAME}.cfg + --localconfig /usr/local/etc/catlfish/${NODENAME}.cfg \ + ${MERGE_EXTRA_ARGS} date echo "merge: waiting $(expr $S2 / 60)m$(expr $S2 % 60)s before merging again" sleep $S2 |