On Jul 30, 2022, at 2:33 AM, Peter Müller <peter.mueller@ipfire.org> wrote:

Hello Jon,

thank you for submitting this. Regarding the "rm" calls, I have two comments:

(a) For transparency reasons, I have shifted to always adding "-v" argument to
   rm calls during a Core Update, so deleted files are logged. In case of
   troubleshooting, this should make (our) lives a bit easier since it is clear
   what has been deleted.

(b) This could have been one single rm call, i.e.:

rm -rvf \
file A \
file B \
... \
file N

   The update.sh script for Core Update 170 should feature such a (lengthy)
   rm call, if I am not mistaken.

Thanks, and best regards,
Peter Müller

- processes-mysqld
- processes-snort
- processes-rtorrent
- processes-asterisk
- processes-java
- processes-spamd
Signed-off-by: Jon Murphy <jon.murphy@ipfire.org>
---
 config/rootfiles/core/170/update.sh | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
diff --git a/config/rootfiles/core/170/update.sh b/config/rootfiles/core/170/update.sh
index cbac8572e..ec6c5ad09 100644
--- a/config/rootfiles/core/170/update.sh
+++ b/config/rootfiles/core/170/update.sh
@@ -170,6 +170,20 @@ sed -i /etc/collectd.conf \
  -e "/LoadPlugin entropy/d"
 /etc/init.d/collectd restart
 +# Stop collectd Sevice
+/etc/init.d/collectd stop
+
+# Cleanup old collectd statistics...
+rm -rf /var/log/rrd/collectd/localhost/processes-mysqld
+rm -rf /var/log/rrd/collectd/localhost/processes-snort
+rm -rf /var/log/rrd/collectd/localhost/processes-rtorrent
+rm -rf /var/log/rrd/collectd/localhost/processes-asterisk
+rm -rf /var/log/rrd/collectd/localhost/processes-java
+rm -rf /var/log/rrd/collectd/localhost/processes-spamd
+#
+# Start collectd
+/etc/init.d/collectd start
+
 # Start services
 /etc/init.d/rc.d/unbound start
 /etc/init.d/rc.d/suricata start