update.sh: Remove the lines related to FEODO_RECOMMENDED

- This removes the lines related to removing any time entries in the modified file for
   FEODO_RECOMMENDED.
- This also removes the lines realted to removing the blocklists for the
   FEODO_RECOMMENDED sources from the /var/lib/ipblocklist directory.
- This patch will ensure that FEODO_RECOMMENDED stays in place if it was being used.

Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>

diff --git a/config/rootfiles/core/191/update.sh b/config/rootfiles/core/191/update.sh
index 6e057e4858a71ba1ef3427e6ae2b22a36a52a6dd..a2d61ec529e5a2a81b24833d0b287225d793a448 100644 (file)
--- a/config/rootfiles/core/191/update.sh
+++ b/config/rootfiles/core/191/update.sh
@@ -36,14 +36,10 @@ done
 # Extract files
 extract_files
 
-# Remove any entry for FEODO_RECOMMENDED, FEODO_IP or FEODO_AGGRESSIVE from the ipblocklist
+# Remove any entry for FEODO_IP or FEODO_AGGRESSIVE from the ipblocklist
 # modified file and the associated ipblocklist files from the /var/lib/ipblocklist directory
-sed -i '/FEODO_RECOMMENDED=/d' /var/ipfire/ipblocklist/modified
 sed -i '/FEODO_IP=/d' /var/ipfire/ipblocklist/modified
 sed -i '/FEODO_AGGRESSIVE=/d' /var/ipfire/ipblocklist/modified
-if [ -e /var/lib/ipblocklist/FEODO_RECOMMENDED.conf ]; then
-       rm /var/lib/ipblocklist/FEODO_RECOMMENDED.conf
-fi
 if [ -e /var/lib/ipblocklist/FEODO_IP.conf ]; then
        rm /var/lib/ipblocklist/FEODO_IP.conf
 fi