From 6ecbf3930b67e718132bb35867936b6797999e1e Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Fri, 2 Feb 2024 15:26:57 +0100 Subject: [PATCH 1/4] Move XRay package in Network category --- xray-core/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xray-core/Makefile b/xray-core/Makefile index 369577d04..d2ec1ee23 100644 --- a/xray-core/Makefile +++ b/xray-core/Makefile @@ -20,8 +20,8 @@ include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/openmptcprouter/golang/golang-package.mk define Package/$(PKG_NAME)/template - SECTION:=Custom - CATEGORY:=Extra packages + SECTION:=net + CATEGORY:=Network TITLE:=Xray-core DEPENDS:=$(GO_ARCH_DEPENDS) endef From 91684da83b69bc7eaa0801db57eab530433c3bab Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 7 Feb 2024 11:20:42 +0100 Subject: [PATCH 2/4] Back to /sys/... changes for z8102 --- z8102/files/etc/init.d/z8102 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/z8102/files/etc/init.d/z8102 b/z8102/files/etc/init.d/z8102 index 8a5a615de..67f2cc068 100755 --- a/z8102/files/etc/init.d/z8102 +++ b/z8102/files/etc/init.d/z8102 @@ -16,36 +16,42 @@ start_service() #echo $i > /sys/class/gpio/export #echo "out" > /sys/class/gpio/gpio${i}/direction #echo "0" > /sys/class/gpio/gpio${i}/value - gpioset `gpiofind "sim1"`=0 + echo "0" > /sys/class/gpio/sim1/value + #gpioset `gpiofind "sim1"`=0 # sim 2 #i=462 #echo $i > /sys/class/gpio/export #echo "out" > /sys/class/gpio/gpio${i}/direction #echo "0" > /sys/class/gpio/gpio${i}/value - gpioset `gpiofind "sim2"`=0 + echo "0" > /sys/class/gpio/sim2/value + #gpioset `gpiofind "sim2"`=0 # stop modem 1 #i=459 #echo $i > /sys/class/gpio/export #echo "out" > /sys/class/gpio/gpio${i}/direction #echo "0" > /sys/class/gpio/gpio${i}/value - gpioset `gpiofind "modem1"`=0 + echo "0" > /sys/class/gpio/modem1/value + #gpioset `gpiofind "modem1"`=0 # stop modem 2 #i=460 #echo $i > /sys/class/gpio/export #echo "out" > /sys/class/gpio/gpio${i}/direction #echo "0" > /sys/class/gpio/gpio${i}/value - gpioset `gpiofind "modem2"`=0 + echo "0" > /sys/class/gpio/modem2/value + #gpioset `gpiofind "modem2"`=0 sleep 1 # run modem 1 #i=459 #echo "1" > /sys/class/gpio/gpio${i}/value - gpioset `gpiofind "modem1"`=1 + echo "1" > /sys/class/gpio/modem1/value + #gpioset `gpiofind "modem1"`=1 sleep 3 # run modem 2 #i=460 #echo "1" > /sys/class/gpio/gpio${i}/value - gpioset `gpiofind "modem2"`=1 + echo "1" > /sys/class/gpio/modem2/value + #gpioset `gpiofind "modem2"`=1 } From f4cacab141eab7aafd61aa7de75bf96c8e5958e6 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 7 Feb 2024 11:22:11 +0100 Subject: [PATCH 3/4] Remove z8102ax config from uci defaults system --- .../files/etc/uci-defaults/2060-omr-system | 45 ++++++++++--------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/openmptcprouter/files/etc/uci-defaults/2060-omr-system b/openmptcprouter/files/etc/uci-defaults/2060-omr-system index 01d8b66b2..af9b39058 100755 --- a/openmptcprouter/files/etc/uci-defaults/2060-omr-system +++ b/openmptcprouter/files/etc/uci-defaults/2060-omr-system @@ -128,28 +128,31 @@ elif [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep rutx)" EOF fi -if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep z8102ax)" ] && [ -z "$(uci show system | grep modem1)" ]; then - uci -q batch <<-EOF >/dev/null - add system led - set system.@led[-1].name='modem1' - set system.@led[-1].sysfs='4g:status' - set system.@led[-1].trigger='netdev' - set system.@led[-1].dev='wwan0' - add_list system.@led[-1].mode='link' - add_list system.@led[-1].mode='tx' - add_list system.@led[-1].mode='rx' - add system led - set system.@led[-1].name='modem2' - set system.@led[-1].sysfs='4g2:status' - set system.@led[-1].trigger='netdev' - set system.@led[-1].dev='wwan1' - add_list system.@led[-1].mode='link' - add_list system.@led[-1].mode='tx' - add_list system.@led[-1].mode='rx' - commit system - EOF -fi +#if [ -n "$(ubus call system board | jsonfilter -e '@.board_name' | grep z8102ax)" ] && [ -z "$(uci show system | grep modem1)" ]; then +# uci -q batch <<-EOF >/dev/null +# add system led +# set system.@led[-1].name='modem1' +# set system.@led[-1].sysfs='modem1:status' +# set system.@led[-1].trigger='netdev' +# set system.@led[-1].dev='wwan0' +# add_list system.@led[-1].mode='link' +# add_list system.@led[-1].mode='tx' +# add_list system.@led[-1].mode='rx' +# add system led +# set system.@led[-1].name='modem2' +# set system.@led[-1].sysfs='modem2:status' +# set system.@led[-1].trigger='netdev' +# set system.@led[-1].dev='wwan1' +# add_list system.@led[-1].mode='link' +# add_list system.@led[-1].mode='tx' +# add_list system.@led[-1].mode='rx' +# commit system +# EOF +#fi #sed -i 's/^\tlogger -t/\t[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] \&\& logger -t/g' /usr/share/ModemManager/modemmanager.common +#service keepalived stop 2>&1 >/dev/null +#service keepalived disabled 2>&1 >/dev/null + exit 0 \ No newline at end of file From 41ec70a23269798985ed8dcbc0414ac751cc2606 Mon Sep 17 00:00:00 2001 From: "Ycarus (Yannick Chabanois)" Date: Wed, 7 Feb 2024 11:22:52 +0100 Subject: [PATCH 4/4] Fix typo in omr-schedule services --- omr-schedule/files/usr/share/omr/schedule.d/010-services | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/omr-schedule/files/usr/share/omr/schedule.d/010-services b/omr-schedule/files/usr/share/omr/schedule.d/010-services index 44e82fe8b..acbbed0fb 100755 --- a/omr-schedule/files/usr/share/omr/schedule.d/010-services +++ b/omr-schedule/files/usr/share/omr/schedule.d/010-services @@ -165,12 +165,12 @@ multipath_fix() { config_load network config_foreach multipath_fix interface -if [ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then +if [ -f /etc/init.d/shadowsocks-libev ] && [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.168.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then _log "Can't find omr-tracker-ss for Shadowsocks libev, restart omr-tracker..." /etc/init.d/omr-tracker restart 2>&1 >/dev/null fi -if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.rust.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then +if [ -f /etc/init.d/shadowsocks-rust ] && [ "$(uci -q get shadowsocks-rust.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-rust.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-rust.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.rust.server)" != "192.168.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then _log "Can't find omr-tracker-ss for Shadowsocks Rust, restart omr-tracker..." /etc/init.d/omr-tracker restart 2>&1 >/dev/null fi