From a76db920e032bf14aef822f1ebc299c26db8b686 Mon Sep 17 00:00:00 2001
From: Darren 'Tadgy' Austin <darren@afterdark.org.uk>
Date: Tue, 2 Feb 2021 10:00:56 +0000
Subject: [PATCH] Move where netdata is started and stopped in rc.local*.

---
 sample-rc.d/rc.local          | 6 +++---
 sample-rc.d/rc.local_shutdown | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sample-rc.d/rc.local b/sample-rc.d/rc.local
index 173728b..089b5c8 100755
--- a/sample-rc.d/rc.local
+++ b/sample-rc.d/rc.local
@@ -17,6 +17,9 @@ for MOUNT in $(grep -v "^#" /etc/fstab | awk '/[[:blank:]]glusterfs[[:blank:]]/
 # Start the vnstat daemon.
 [ -x /etc/rc.d/rc.vnstat ] && /etc/rc.d/rc.vnstat start
 
+# Start netdata.
+[ -x /etc/rc.d/rc.netdata ] && /etc/rc.d/rc.netdata start
+
 # Start fail2ban.
 [ -x /etc/rc.d/rc.fail2ban ] && /etc/rc.d/rc.fail2ban start
 
@@ -40,9 +43,6 @@ for MOUNT in $(grep -v "^#" /etc/fstab | awk '/[[:blank:]]glusterfs[[:blank:]]/
   /etc/rc.d/rc.rsyncd start
 }
 
-# Start netdata.
-[ -x /etc/rc.d/rc.netdata ] && rm -f /var/lock/subsys/netdata && /etc/rc.d/rc.netdata start
-
 # Start the bandwidth bar generator.
 [ -x /opt/bin/bwbar ] && sudo -b /opt/bin/bwbar -f /run/bwbar.txt -p /run/bwbar.png -t 1 -x 800 -y 8 -b 2 eth0 1000
 
diff --git a/sample-rc.d/rc.local_shutdown b/sample-rc.d/rc.local_shutdown
index 246290f..58b3658 100755
--- a/sample-rc.d/rc.local_shutdown
+++ b/sample-rc.d/rc.local_shutdown
@@ -17,9 +17,6 @@
   /etc/rc.d/rc.libvirt stop
 }
 
-# Shut down netdata.
-[ -x /etc/rc.d/rc.netdata ] && /etc/rc.d/rc.netdata stop
-
 # Stop the rtorrent instances started at boot.
 grep "^seeder:" /etc/passwd >/dev/null 2>&1 && {
   pkill -INT  -u seeder '^rtorrent .*$'
@@ -57,6 +54,9 @@ grep "^seeder:" /etc/passwd >/dev/null 2>&1 && {
 # Stop fail2ban.
 [ -x /etc/rc.d/rc.fail2ban ] && /etc/rc.d/rc.fail2ban stop
 
+# Stop netdata.
+[ -x /etc/rc.d/rc.netdata ] && /etc/rc.d/rc.netdata stop
+
 # Stop the vnstat daemon.
 [ -x /etc/rc.d/rc.vnstat ] && /etc/rc.d/rc.vnstat stop