Fixed fw hooks pre-checks

Author: SloCompTech

root/app/hookBaseFirewallDestroy.sh

@@ -0,0 +1,15 @@
+#!/usr/bin/with-contenv bash
+
+#
+#	Pre-checks for firewall destruction related hooks
+#
+
+# Check if firewall rules are disabled
+if [ "$USE_FIREWALL" == "false" ]; then
+  exit 0 # Don't use fw rules
+fi
+
+# Don't run if persistent interface
+if [ "$PERSISTENT_INTERFACE" == "true" ]; then
+  exit 0  
+fi

root/app/hookBaseFirewall.sh renamed to root/app/hookBaseFirewallSetup.sh

@@ -1,20 +1,20 @@
 #!/usr/bin/with-contenv bash
 
 #
-#	Pre-checks for firewall related hooks
+#	Pre-checks for firewall setup related hooks
 #
 
 # Check if firewall rules are disabled
 if [ "$USE_FIREWALL" == "false" ]; then
-    exit 0 # Don't use fw rules
+  exit 0 # Don't use fw rules
 fi
 
 # Run script only once if persistent interface
 # @see https://stackoverflow.com/questions/4774054/reliable-way-for-a-bash-script-to-get-the-full-path-to-itself
 if [ "$PERSISTENT_INTERFACE" == "true" ]; then
-    flagFile="$(realpath $0).flag"
-    if [ -f "$flagFile" ]; then
-        exit 0 # Flag file exists, exit
-    fi
-    touch $flagFile
+  flagFile="$(realpath $0).flag"
+  if [ -f "$flagFile" ]; then
+    exit 0 # Flag file exists, exit
+  fi
+  touch $flagFile
 fi

root/defaults/example/config/basic_nat/hooks/down/10-network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-source /app/hookBaseFirewall.sh
+source /app/hookBaseFirewallDestroy.sh
 
 #
 #   Network clear

root/defaults/example/config/basic_nat/hooks/finish/10-network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-source /app/hookBaseFirewall.sh
+source /app/hookBaseFirewallDestroy.sh
 
 #
 #   Network clear

root/defaults/example/config/basic_nat/hooks/init/10-network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-source /app/hookBaseFirewall.sh
+source /app/hookBaseFirewallSetup.sh
 
 #
 #   Network initialization

root/defaults/example/config/basic_nat/hooks/up/10-network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-source /app/hookBaseFirewall.sh
+source /app/hookBaseFirewallSetup.sh
 
 #
 #   Network initialization

root/defaults/example/config/basic_nat_wlp/hooks/down/10-network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-source /app/hookBaseFirewall.sh
+source /app/hookBaseFirewallDestroy.sh
 
 #
 #   Network clear

root/defaults/example/config/basic_nat_wlp/hooks/finish/10-network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-source /app/hookBaseFirewall.sh
+source /app/hookBaseFirewallDestroy.sh
 
 #
 #   Network clear

root/defaults/example/config/basic_nat_wlp/hooks/init/10-network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-source /app/hookBaseFirewall.sh
+source /app/hookBaseFirewallSetup.sh
 
 #
 #   Network initialization

root/defaults/example/config/basic_nat_wlp/hooks/up/10-network.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/with-contenv bash
 
-source /app/hookBaseFirewall.sh
+source /app/hookBaseFirewallSetup.sh
 
 #
 #   Network initialization