From a3ca2f0f68e66c221d1a615522157532fb475ebf Mon Sep 17 00:00:00 2001 From: Jeremy Lecour Date: Wed, 20 Jul 2022 14:24:12 +0200 Subject: [PATCH] check-setup: check minifirewall version only if minifirewall is present --- server/lib/bkctld-check-setup | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/lib/bkctld-check-setup b/server/lib/bkctld-check-setup index 6e8ac21..137c49c 100755 --- a/server/lib/bkctld-check-setup +++ b/server/lib/bkctld-check-setup @@ -29,11 +29,12 @@ fi # Check if the firewall file is sourced minifirewall_config=/etc/default/minifirewall -minifirewall_version=$(grep -E -o "^VERSION=(\S+)" /etc/init.d/minifirewall | head -1 | cut -d '=' -f 2 | tr -d "'" | tr -d '"') if [ -n "${FIREWALL_RULES}" ] \ && [ -r "${FIREWALL_RULES}" ] \ && [ -f "${minifirewall_config}" ]; then + minifirewall_version=$(grep -E -o "^VERSION=(\S+)" /etc/init.d/minifirewall | head -1 | cut -d '=' -f 2 | tr -d "'" | tr -d '"') + if [ -n "${minifirewall_version}" ] && dpkg --compare-versions "${minifirewall_version}" ge "22.03"; then # Minifirewall 22.03+ includes files automatically nb_ok=$((nb_ok + 1))