Compare commits

...

4 Commits

Author SHA1 Message Date
Alexandre
3516f41664 Pin resolved WireGuard endpoint route before VPN startup 2026-05-13 11:31:41 +02:00
github-actions
53109170ca GitHub bot: changelog [nobuild] 2026-05-13 07:19:57 +00:00
Alexandre
9b9157092c Update config.yaml 2026-05-13 09:15:28 +02:00
Alexandre
12e141eacf Update run 2026-05-13 09:15:16 +02:00
4 changed files with 33 additions and 1 deletions

View File

@@ -1,3 +1,5 @@
## 5.2.0-16 (13-05-2026)
- Minor bugs fixed
## 5.2.0-2 (2026-05-10)
- Fix startup loop on aarch64: drop s6-notifyoncheck wrapper so s6 supervises qbittorrent-nox directly (LSIO arm64 image has no notification-fd, causing EBADF restart loop)

View File

@@ -143,4 +143,4 @@ schema:
slug: qbittorrent
udev: true
url: https://github.com/alexbelgium/hassio-addons
version: "5.2.0-2"
version: "5.2.0-16"

View File

@@ -49,5 +49,6 @@ if [ -f /etc/s6-overlay/s6-rc.d/svc-qbittorrent/notification-fd ]; then
s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost ${WEBUI_PORT}" \
s6-setuidgid abc /app/qbittorrent-nox --webui-port="${WEBUI_PORT}" > "${QB_OUTPUT}"
else
sleep 10
exec s6-setuidgid abc /app/qbittorrent-nox --webui-port="${WEBUI_PORT}" > "${QB_OUTPUT}"
fi

View File

@@ -93,6 +93,33 @@ _check_host() {
fi
}
_add_endpoint_route() {
local endpoint_ip="$1"
local result=0
_check_host "${endpoint_ip}" || result=$?
if [ "${result}" -eq 1 ]; then
local default_route
default_route="$(ip -4 route show default | head -n1)"
if [ -z "${default_route}" ]; then
bashio::log.warning "No IPv4 default route found to pin VPN endpoint ${endpoint_ip}."
return 0
fi
_cmd "ip -4 route replace ${endpoint_ip}/32 ${default_route}" || return 1
elif [ "${result}" -eq 2 ]; then
local default_route
default_route="$(ip -6 route show default | head -n1)"
if [ -z "${default_route}" ]; then
bashio::log.warning "No IPv6 default route found to pin VPN endpoint ${endpoint_ip}."
return 0
fi
_cmd "ip -6 route replace ${endpoint_ip}/128 ${default_route}" || return 1
else
bashio::log.warning "Skipping endpoint route pinning for invalid endpoint IP: ${endpoint_ip}"
fi
}
_resolvconf() {
local mode=$1
local resolv_conf="/etc/resolv.conf"
@@ -435,6 +462,7 @@ wireguard() {
for endpoint_ip in "${endpoint_ips[@]}"; do
bashio::log.info "Resolved WireGuard endpoint hostname ${config["EndpointHost"]} to IP: ${endpoint_ip}"
config["EndpointIP"]="${endpoint_ip}"
_add_endpoint_route "${config["EndpointIP"]}" || return 1
if _wireguard_up; then
bashio::log.info "WireGuard interface ${config["Interface"]} is up."
bashio::exit.ok 'WireGuard started.'
@@ -445,6 +473,7 @@ wireguard() {
else
bashio::log.debug "WireGuard endpoint ${config["EndpointHost"]} is a valid IP address. Using as is."
config["EndpointIP"]="${config["EndpointHost"]}"
_add_endpoint_route "${config["EndpointIP"]}" || return 1
if _wireguard_up; then
bashio::log.info "WireGuard interface ${config["Interface"]} is up."
bashio::exit.ok 'WireGuard started.'