Set dnsmasq config after nft set are created (#443)

suyuan168 · Feb 26, 2024 · aac6bfe · aac6bfe
2 parents 4cca910 + 0f16943
commit aac6bfe
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/omr-bypass/files/etc/init.d/omr-bypass-nft b/omr-bypass/files/etc/init.d/omr-bypass-nft
@@ -560,13 +560,6 @@ _intf_rule() {
 	[ -z "$intf" ] && return
 #	[ -z "$RELOAD" ] || [ "$(uci show firewall.omr_dst_bypass_$intf_4)" = "" ] && {
 		#unset RELOAD
-		#echo "$intf ip set dhcp"
-		uci batch <<-EOF
-			set dhcp.omr_dst_bypass_$intf=ipset
-			add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_4"
-			add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_6"
-			commit dhcp
-		EOF
 		#echo "firewall omr_dst_bypass ipset"
 		uci -q batch <<-EOF
 			set firewall.omr_dst_bypass_${intf}_4=ipset
@@ -678,6 +671,12 @@ _intf_rule() {
 				commit network
 			EOF
 		fi
+		uci batch <<-EOF
+			set dhcp.omr_dst_bypass_$intf=ipset
+			add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_4"
+			add_list dhcp.omr_dst_bypass_$intf.name="omr_dst_bypass_${intf}_6"
+			commit dhcp
+		EOF
 
 	if [ "$(uci -q get openmptcprouter.settings.proxy)" = "shadowsocks" ]; then
 		config_load shadowsocks-libev