From 2606338b562d6d5fb35283c6a043d0f9bc0a5731 Mon Sep 17 00:00:00 2001 From: clerie Date: Thu, 20 Nov 2025 20:03:38 +0100 Subject: [PATCH 1/2] pkgs/ds-lite-dhcpcd-hook: Netcologne can't handle Tunnel Encapsulation Limit, so don't send these options in the DS-Lite tunnel --- pkgs/ds-lite-dhcpcd-hook/ds-lite-dhcpcd-hook.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/ds-lite-dhcpcd-hook/ds-lite-dhcpcd-hook.sh b/pkgs/ds-lite-dhcpcd-hook/ds-lite-dhcpcd-hook.sh index 32f025f..75acf8c 100644 --- a/pkgs/ds-lite-dhcpcd-hook/ds-lite-dhcpcd-hook.sh +++ b/pkgs/ds-lite-dhcpcd-hook/ds-lite-dhcpcd-hook.sh @@ -83,7 +83,7 @@ if TUNNEL_INTERFACE_CONFIG="$(ip --json link show "${TUNNEL_INTERFACE_NAME}")"; if [[ "${TUNNEL_INTERFACE_ORIGIN_ADDRESS}" != "${WAN_INTERFACE_ADDRESS}" || "${TUNNEL_INTERFACE_REMOTE_ADDRESS}" != "${AFTR_ADDRESS}" || "${TUNNEL_INTERFACE_OPERSTATE}" != "UNKNOWN" ]]; then log_tunnel "Bad configuration, fixing tunnel parameter" - ip tunnel change "${TUNNEL_INTERFACE_NAME}" mode ipip6 local "${WAN_INTERFACE_ADDRESS}" remote "${AFTR_ADDRESS}" + ip tunnel change "${TUNNEL_INTERFACE_NAME}" mode ipip6 local "${WAN_INTERFACE_ADDRESS}" remote "${AFTR_ADDRESS}" encaplimit none ip link set "$TUNNEL_INTERFACE_NAME" up else log_tunnel "Tunnel already configured" @@ -91,7 +91,7 @@ if TUNNEL_INTERFACE_CONFIG="$(ip --json link show "${TUNNEL_INTERFACE_NAME}")"; else log_tunnel "Setting up DS-Lite tunnel" - ip tunnel add "${TUNNEL_INTERFACE_NAME}" mode ipip6 local "${WAN_INTERFACE_ADDRESS}" remote "${AFTR_ADDRESS}" + ip tunnel add "${TUNNEL_INTERFACE_NAME}" mode ipip6 local "${WAN_INTERFACE_ADDRESS}" remote "${AFTR_ADDRESS}" encaplimit none ip link set "$TUNNEL_INTERFACE_NAME" up fi From 50f2f01437d03a6c198843f6b86464ea81813753 Mon Sep 17 00:00:00 2001 From: Flake Update Bot Date: Fri, 21 Nov 2025 03:03:17 +0100 Subject: [PATCH 2/2] Update nixpkgs 2025-11-21-02-03 --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 8f3d835..8319bf8 100644 --- a/flake.lock +++ b/flake.lock @@ -666,11 +666,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1761114652, - "narHash": "sha256-f/QCJM/YhrV/lavyCVz8iU3rlZun6d+dAiC3H+CDle4=", + "lastModified": 1763421233, + "narHash": "sha256-Stk9ZYRkGrnnpyJ4eqt9eQtdFWRRIvMxpNRf4sIegnw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "01f116e4df6a15f4ccdffb1bcd41096869fb385c", + "rev": "89c2b2330e733d6cdb5eae7b899326930c2c0648", "type": "github" }, "original": {