From aa3523263d8fbfd1d7c531f400e0653d401dc712 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 13 Jun 2018 15:39:12 +0200
Subject: [PATCH] rc: improve netflow backup, closes #2461

---
 src/etc/rc.syshook.d/backup/20-netflow | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/etc/rc.syshook.d/backup/20-netflow b/src/etc/rc.syshook.d/backup/20-netflow
index 64096c4c3..26a0f9a72 100755
--- a/src/etc/rc.syshook.d/backup/20-netflow
+++ b/src/etc/rc.syshook.d/backup/20-netflow
@@ -3,16 +3,22 @@
 BACKUPFILE="/conf/netflow.tgz"
 BACKUPDIR="/var/netflow"
 
+# find out if the service is running and stop/start it only if needed
+RCSCRIPT="/usr/local/etc/rc.d/flowd_aggregate"
+if ! ${RCSCRIPT} status; then
+	RCSCRIPT="true"
+fi
+
 if [ "${1}" = "restore" ]; then
 	if [ -f "${BACKUPFILE}" ]; then
+		${RCSCRIPT} stop
 		tar -C / -xzpf "${BACKUPFILE}"
+		${RCSCRIPT} start
 	fi
 else
 	if [ -d "${BACKUPDIR}" ]; then
-		/usr/local/etc/rc.d/flowd_aggregate stop
+		${RCSCRIPT} stop
 		tar -C / -czf "${BACKUPFILE}" ."${BACKUPDIR}"
-		if [ "${1}" != "stop" ]; then
-			/usr/local/etc/rc.d/flowd_aggregate start
-		fi
+		${RCSCRIPT} start
 	fi
 fi