Added nftables fix

bin/v-list-sys-services

@@ -328,8 +328,15 @@ fi
 # Checking FIREWALL system
 if [ -n "$FIREWALL_SYSTEM" ] && [ "$FIREWALL_SYSTEM" != 'remote' ]; then
 	state="stopped"
-	if $(iptables -S INPUT | grep -qx '\-P INPUT DROP'); then
+	if [ -f /etc/redhat-release ]; then
-		state="running"
+		RES=$(systemctl is-active nftables | grep -E "^active")
+		if [ -n "$RES" ]; then
+			state="running"
+		fi
+	else
+		if $(iptables -S INPUT | grep -qx '\-P INPUT DROP'); then
+			state="running"
+		fi
 	fi
 	data="$data\nNAME='$FIREWALL_SYSTEM' SYSTEM='firewall'"
 	data="$data STATE='$state' CPU='0' MEM='0' RTIME='0'"

bin/v-start-service

@@ -42,6 +42,16 @@ fi
 
 for service in $service_list; do
 	if [ "$service" = "iptables" ]; then
+		if [ -f /etc/redhat-release ]; then
+			RES=$(systemctl is-enabled nftables | grep enabled)
+			if [ -z "$RES" ]; then
+				systemctl enable nftables --now
+			fi
+			systemctl status nftables
+			if [ $? -ne 0 ]; then
+				systemctl start nftables
+			fi
+		fi
 		$BIN/v-update-firewall
 	else
 		systemctl start "$service"

bin/v-update-firewall

@@ -46,18 +46,26 @@ if [ ! -e "$rules" ]; then
 	exit
 fi
 
-# Checking conntrack module avaiabilty
+if [ -f /etc/redhat-release ]; then
-$modprobe nf_conntrack > /dev/null 2>&1
+	conntrack='yes'
-if [ $? -ne 0 ]; then
+else
-	$sysctl net.netfilter.nf_conntrack_max > /dev/null 2>&1
+	# Checking conntrack module avaiabilty
+	$modprobe nf_conntrack > /dev/null 2>&1
 	if [ $? -ne 0 ]; then
-		conntrack='no'
+		$sysctl net.netfilter.nf_conntrack_max > /dev/null 2>&1
+		if [ $? -ne 0 ]; then
+			conntrack='no'
+		fi
 	fi
 fi
 
-$modprobe nf_conntrack_ftp > /dev/null 2>&1
+if [ -f /etc/redhat-release ]; then
-if [ $? -ne 0 ]; then
+	conntrack_ftp='yes'
-	conntrack_ftp='no'
+else
+	$modprobe nf_conntrack_ftp > /dev/null 2>&1
+	if [ $? -ne 0 ]; then
+		conntrack_ftp='no'
+	fi
 fi
 
 # Checking custom OpenSSH  port

install/hst-install-rhel.sh

@@ -901,12 +901,10 @@ fi
 
 if [ "$iptables" = 'yes' ]; then
 	if [ -f /etc/redhat-release ]; then
-		# Revert from nftables to iptables only first time
+		dnf install iptables-nft -y
 		systemctl stop firewalld
 		systemctl disable firewalld
-		dnf erase nftables -y
+		systemctl enable nftables --now
-		dnf install iptables-legacy iptables-legacy-libs iptables-services iptables-utils ipset -y
-		systemctl enable iptables --now
 	fi
 fi