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'"}' diff --git a/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab b/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab new file mode 100755 index 000000000..6e028a293 --- /dev/null +++ b/openmptcprouter/files/etc/uci-defaults/2030-omr-fstab @@ -0,0 +1,17 @@ +#!/bin/sh +. /lib/functions.sh + +_set_fsck() { + uci -q batch <<-EOF >/dev/null + set "fstab.$1.enabled=1" + set "fstab.$1.enabled_fsck=1" + EOF +} + +[ -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 +uci -q commit fstab + +exit 0 \ No newline at end of file