From 2a6b998d9ee4f3c60e4327b23a5cadc100af5ee7 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Fri, 27 Jan 2017 11:33:58 +0100
Subject: [PATCH 1/3] Use absolute path for btrfs command (fix cron use)

---
 bkctld | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/bkctld b/bkctld
index 6d34994..c435a9c 100755
--- a/bkctld
+++ b/bkctld
@@ -215,7 +215,7 @@ sub_init() {
 
 	echo "Create jail $jail :"	
 	if ( check_btrfs); then
-		btrfs subvolume create ${JAILDIR}/${jail}
+		/sbin/btrfs subvolume create ${JAILDIR}/${jail}
 	else
 		mkdir -p ${JAILDIR}/${jail}
 	fi
@@ -263,10 +263,10 @@ sub_remove() {
 	if ( check_btrfs ); then
 		rm -f ${CONFDIR}/${jail}
 		if [ -d  ${INCDIR}/${jail} ]; then
-			btrfs subvolume delete ${INCDIR}/${jail}/*
+			/sbin/btrfs subvolume delete ${INCDIR}/${jail}/*
 			rmdir ${INCDIR}/${jail}
 		fi
-		btrfs subvolume delete ${JAILDIR}/${jail}
+		/sbin/btrfs subvolume delete ${JAILDIR}/${jail}
 	else
 		rm -f ${CONFDIR}/${jail}
 		rm -rf ${INCDIR}/${jail}
@@ -415,7 +415,7 @@ sub_inc() {
 		if [ ! -d "${inc}" ]; then
 			start=$(date +"%H:%M:%S")
 			if ( check_btrfs ); then
-				btrfs subvolume snapshot ${JAILDIR}/$jail $inc > /dev/null
+				/sbin/btrfs subvolume snapshot ${JAILDIR}/$jail $inc > /dev/null
 			else
 				cp -alx ${JAILDIR}/${jail}/ $inc
 			fi
@@ -469,7 +469,7 @@ sub_rm() {
 	        for j in $( grep -v -f <(echo "${keep}") <(echo "${incs}") ); do
 			start=$(date +"%H:%M:%S")
 			if ( check_btrfs ); then
-				btrfs subvolume delete ${INCDIR}/$jail/$j >/dev/null
+				/sbin/btrfs subvolume delete ${INCDIR}/$jail/$j >/dev/null
 			else
 				cd ${INCDIR}/$jail
 			        rsync -a --delete $empty $j*

From 43137dadb253469afbd054ef8758efa63d819f4b Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Wed, 1 Feb 2017 16:31:12 +0100
Subject: [PATCH 2/3] Make minifirewall silent

---
 bkctld | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bkctld b/bkctld
index c435a9c..8fe8f53 100755
--- a/bkctld
+++ b/bkctld
@@ -163,7 +163,7 @@ set_firewall() {
 			echo "/sbin/iptables -A INPUT -p tcp --sport 1024: --dport $port -s $ip -j ACCEPT #$jail" >> $FIREWALL_RULES
 		done
 		if [ -f /etc/init.d/minifirewall ]; then
-			/etc/init.d/minifirewall restart
+			/etc/init.d/minifirewall restart >/dev/null
 		fi
 	fi
 }
@@ -402,7 +402,7 @@ sub_sync() {
 	fi
 	if [ -n "${FIREWALL_RULES}" ]; then
 		rsync -a ${FIREWALL_RULES} ${NODE}:${FIREWALL_RULES}
-		ssh $NODE /etc/init.d/minifirewall restart
+		ssh $NODE /etc/init.d/minifirewall restart >/dev/null
 	fi
 }
 

From 3ad28029a3360984296d2bac61a8a936f97802b5 Mon Sep 17 00:00:00 2001
From: Victor LABORIE <vlaborie@evolix.fr>
Date: Thu, 2 Feb 2017 10:20:05 +0100
Subject: [PATCH 3/3] Fix bkctld sync

---
 bkctld | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bkctld b/bkctld
index 8fe8f53..bb5344d 100755
--- a/bkctld
+++ b/bkctld
@@ -395,10 +395,11 @@ sub_sync() {
 		exit 1
 	fi
 	jail=$1
-	rsync -a ${CONFDIR}/$jail ${NODE}:${CONFDIR}/$jail
+	ssh $NODE bkctld init $jail >/dev/null
 	rsync -a ${JAILDIR}/${jail}/ ${NODE}:${JAILDIR}/${jail}/ --exclude proc/* --exclude sys/* --exclude dev/* --exclude var/run/*.pid --exclude var/backup/*
+	rsync -a ${CONFDIR}/$jail ${NODE}:${CONFDIR}/$jail
 	if ( check_jail_on $jail ); then
-		ssh $NODE bkctld start $jail
+		ssh $NODE bkctld start $jail >/dev/null
 	fi
 	if [ -n "${FIREWALL_RULES}" ]; then
 		rsync -a ${FIREWALL_RULES} ${NODE}:${FIREWALL_RULES}