From 2f7486d85b22ea0910283320248f7739fd0fcfd8 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Fri, 12 Jun 2015 19:12:44 +0200
Subject: Pass $MERGE_EXTRA_ARGS.

---
 catlfish-dev/merge.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'catlfish-dev')

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
-- 
cgit v1.1