From b4f35af35cf37a17152216c566f63f56ac4163df Mon Sep 17 00:00:00 2001
From: Jeremy Lecour <jlecour@evolix.fr>
Date: Tue, 8 Mar 2022 16:48:41 +0100
Subject: [PATCH] backup-server-state: skip iptables if nft is installed

---
 evolinux-base/files/backup-server-state.sh | 57 ++++++++++++----------
 1 file changed, 31 insertions(+), 26 deletions(-)

diff --git a/evolinux-base/files/backup-server-state.sh b/evolinux-base/files/backup-server-state.sh
index 8e64c423..2858f7b1 100644
--- a/evolinux-base/files/backup-server-state.sh
+++ b/evolinux-base/files/backup-server-state.sh
@@ -426,37 +426,42 @@ backup_iptables() {
     debug "Backup iptables"
 
     iptables_bin=$(command -v iptables)
+    nft_bin=$(command -v nft)
 
-    if [ -n "${iptables_bin}" ]; then
-        last_result=$({ ${iptables_bin} -L -n -v; ${iptables_bin} -t filter -L -n -v; } > "${backup_dir}/iptables.txt")
-        last_rc=$?
-
-        if [ ${last_rc} -eq 0 ]; then
-            debug "* iptables OK"
-        else
-            debug "* iptables ERROR"
-            debug "${last_result}"
-            rc=10
-        fi
+    if [ -n "${nft_bin}" ]; then
+        debug "* nft found, skip iptables"
     else
-        debug "* iptables not found"
-    fi
+        if [ -n "${iptables_bin}" ]; then
+            last_result=$({ ${iptables_bin} -L -n -v; ${iptables_bin} -t filter -L -n -v; } >> "${backup_dir}/iptables.txt")
+            last_rc=$?
 
-    iptables_save_bin=$(command -v iptables-save)
-
-    if [ -n "${iptables_save_bin}" ]; then
-        last_result=$(${iptables_save_bin} > "${backup_dir}/iptables-save.txt")
-        last_rc=$?
-
-        if [ ${last_rc} -eq 0 ]; then
-            debug "* iptables-save OK"
+            if [ ${last_rc} -eq 0 ]; then
+                debug "* iptables OK"
+            else
+                debug "* iptables ERROR"
+                debug "${last_result}"
+                rc=10
+            fi
         else
-            debug "* iptables-save ERROR"
-            debug "${last_result}"
-            rc=10
+            debug "* iptables not found"
+        fi
+
+        iptables_save_bin=$(command -v iptables-save)
+
+        if [ -n "${iptables_save_bin}" ]; then
+            last_result=$(${iptables_save_bin} > "${backup_dir}/iptables-save.txt")
+            last_rc=$?
+
+            if [ ${last_rc} -eq 0 ]; then
+                debug "* iptables-save OK"
+            else
+                debug "* iptables-save ERROR"
+                debug "${last_result}"
+                rc=10
+            fi
+        else
+            debug "* iptables-save not found"
         fi
-    else
-        debug "* iptables-save not found"
     fi
 }