From b52d3584e5ce7016c57ee1208e7fa344ea62de8c Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 17 Nov 2023 17:34:51 +0100 Subject: [PATCH 1/3] Fix backup server getting keys --- 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 939a0ed7b..0b3512f6e 100755 --- a/openmptcprouter/files/etc/init.d/openmptcprouter-vps +++ b/openmptcprouter/files/etc/init.d/openmptcprouter-vps @@ -2168,12 +2168,12 @@ _config_service() { return fi fi - [ "$(uci -q get openmptcprouter.${servername}.get_config)" = "1" ] && [ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] && { + [ "$(uci -q get openmptcprouter.${servername}.get_config)" = "1" ] && ([ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] || [ "$(uci -q get openmptcprouter.${servername}.current)" = "1" ]) && { _set_config_from_vps _get_gre_tunnel } - [ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] && { + ([ "$(uci -q get openmptcprouter.${servername}.master)" = "1" ] || [ "$(uci -q get openmptcprouter.${servername}.current)" = "1" ]) && { _get_vps_config } From a567f7f8a26769666263e9aedb1f7c84552aaff1 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 17 Nov 2023 17:35:19 +0100 Subject: [PATCH 2/3] Fix XRay remove rules --- xray-core/files/etc/init.d/xray | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xray-core/files/etc/init.d/xray b/xray-core/files/etc/init.d/xray index d69dcc585..3fa53a12f 100755 --- a/xray-core/files/etc/init.d/xray +++ b/xray-core/files/etc/init.d/xray @@ -2244,7 +2244,7 @@ start_instance() { } rules_exist() { - [ -n "$(iptables -w -t nat -L -n 2>/dev/null | grep v2r_)" ] && return 0 + [ -n "$(iptables -w -t nat -L -n 2>/dev/null | grep xr_)" ] && return 0 return 1 } From 0b6cb9e64c96194782b09b0d0de112195e1ff5aa Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 17 Nov 2023 17:36:20 +0100 Subject: [PATCH 3/3] Compile image for RPI5 --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index dd3bbf058..89227b20e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: build: strategy: matrix: - OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx12, rutx50, r5s, qnap-301w] + OMR_TARGET: [bpi-r1, bpi-r2, bpi-r64, rpi2, rpi4, wrt32x, espressobin, r2s, rpi3, wrt3200acm, x86, x86_64, ubnt-erx, r4s, r7800, rutx12, rutx50, r5s, qnap-301w, rpi5] OMR_KERNEL: [5.4, 6.1] runs-on: ubuntu-latest continue-on-error: true