Core 130: Remove files after convert-snort has been launched

[ipfire-2.x.git] / config / rootfiles / core / 130 / update.sh

diff --git a/config/rootfiles/core/130/update.sh b/config/rootfiles/core/130/update.sh
index d33321c3206dc1e6e79f01d9efd3bb3c5242b53a..6d32bdba291a1f048871b7877c5475e0794f9087 100644 (file)
--- a/config/rootfiles/core/130/update.sh
+++ b/config/rootfiles/core/130/update.sh
@@ -37,21 +37,6 @@ if [ -e "/etc/init.d/suricata" ]; then
        /etc/init.d/suricata stop
 fi
 
-# Remove files
-rm -rfv \
-       /etc/rc.d/rc*.d/*snort \
-       /etc/rc.d/init.d/networking/red.up/23-RS-snort \
-       /etc/snort \
-       /usr/bin/daq-modules-config \
-       /usr/bin/u2boat \
-       /usr/bin/u2spewfoo \
-       /usr/lib/daq \
-       /usr/lib/snort \
-       /usr/lib/libdaq.so* \
-       /usr/lib/libsfbpf.so* \
-       /usr/local/bin/snortctl \
-       /usr/sbin/snort
-
 # Rename snort user to suricata
 if getent group snort &>/dev/null; then
        groupmod -n suricata snort
@@ -74,6 +59,22 @@ ldconfig
 # Migrate snort configuration to suricata
 /usr/sbin/convert-snort
 
+# Remove files
+rm -rfv \
+       /etc/rc.d/rc*.d/*snort \
+       /etc/rc.d/init.d/networking/red.up/23-RS-snort \
+       /etc/snort \
+       /usr/bin/daq-modules-config \
+       /usr/bin/u2boat \
+       /usr/bin/u2spewfoo \
+       /usr/lib/daq \
+       /usr/lib/snort \
+       /usr/lib/libdaq.so* \
+       /usr/lib/libsfbpf.so* \
+       /usr/local/bin/snortctl \
+       /usr/sbin/snort \
+       /var/ipfire/snort
+
 # Start services
 /etc/init.d/collectd restart
 /etc/init.d/firewall restart