From 02cade76439c600c119a2f306b00c3032772bdf0 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 18 Jun 2022 09:39:41 +0200
Subject: [PATCH 1/2] Fix typo

---
 openmptcprouter/files/etc/init.d/openmptcprouter-vps | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmptcprouter/files/etc/init.d/openmptcprouter-vps b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
index dcde475fc..1be9331a4 100755
--- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps
+++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps
@@ -1072,7 +1072,7 @@ _vps_firewall_close_port() {
 				src_dport=$(echo $line | awk '{print $5}' | tr -d "\n")
 				source_port=$(echo $line | awk '{print $6}' | tr -d "\n")
 				source_dip=$(echo $line | awk '{print $7}' | tr -d "\n")
-				[ "$source_dip" = "#" ] && source_sip=""
+				[ "$source_dip" = "#" ] && source_dip=""
 				source_ip=$(echo $line | awk '{print $2}' | awk -F ":" '{print $2}' | tr -d "\n")
 				if [ "$source_port" = "-" ]; then
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","source_dip": "'$source_dip'","source_ip": "'$source_ip'"}'
@@ -1097,7 +1097,7 @@ _vps_firewall_close_port() {
 				src_dport=$(echo $line | awk '{print $5}' | tr -d "\n")
 				source_port=$(echo $line | awk '{print $6}' | tr -d "\n")
 				source_dip=$(echo $line | awk '{print $7}' | tr -d "\n")
-				[ "$source_dip" = "#" ] && source_sip=""
+				[ "$source_dip" = "#" ] && source_dip=""
 				source_ip=$(echo $line | awk '{print $2}' | awk -F ":" '{print $2}' | tr -d "\n")
 				if [ "$source_port" = "-" ]; then
 					settings='{"name" : "router '$src_dport'","port" : "'$src_dport'","proto" : "'$proto'","fwtype" : "DNAT","ipproto" : "ipv6","source_dip": "'$source_dip'","source_ip": "'$source_ip'"}'

From 15032839eac5fa0c0f6580d744960f70d1be1227 Mon Sep 17 00:00:00 2001
From: "Ycarus (Yannick Chabanois)" <ycarus@zugaina.org>
Date: Sat, 18 Jun 2022 13:07:57 +0200
Subject: [PATCH 2/2] Fix another typo and populate fstab only if needed

---
 openmptcprouter/files/etc/uci-defaults/2030-omr-fstab | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab b/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab
index 575d0e238..15f2dd49f 100755
--- a/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab
+++ b/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab
@@ -4,11 +4,11 @@
 _set_fsck() {
 	uci -q batch <<-EOF >/dev/null
 		set "fstab.$1.enabled=1"
-		set "fstab.$1.enable_fsck=1"
+		set "fstab.$1.enabled_fsck=1"
 	EOF
 }
 
-/sbin/block detect > /etc/config/fstab
+[ -z "$(uci show fstab | grep mount)" ] && /sbin/block detect > /etc/config/fstab
 uci -q set fstab.@global[0].check_fs='1'
 config_load fstab
 config_foreach _set_fsck mount