From 7f9245ed94cfd42cbb1535af195a0dd98bb7ffa4 Mon Sep 17 00:00:00 2001
From: Daniel Kempkens <daniel+git@kempkens.io>
Date: Sat, 2 Nov 2024 21:10:10 +0100
Subject: [PATCH] wg: fix

---
 system/nixos/wireguard-netns.nix | 44 ++++++++++++++++----------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/system/nixos/wireguard-netns.nix b/system/nixos/wireguard-netns.nix
index 9196372..757a51e 100644
--- a/system/nixos/wireguard-netns.nix
+++ b/system/nixos/wireguard-netns.nix
@@ -34,8 +34,8 @@
     serviceConfig = {
       Type = "oneshot";
       RemainAfterExit = true;
-      ExecStart = "${pkgs.iproute}/bin/ip netns add %I";
-      ExecStop = "${pkgs.iproute}/bin/ip netns del %I";
+      ExecStart = "${pkgs.iproute2}/bin/ip netns add %I";
+      ExecStop = "${pkgs.iproute2}/bin/ip netns del %I";
     };
   };
 
@@ -56,35 +56,35 @@
       ExecStart = with pkgs; writers.writeBash "wg-up" ''
         set -e
         echo "Setting lo to up ..."
-        ${iproute}/bin/ip -n wg link set lo up
+        ${iproute2}/bin/ip -n wg link set lo up
         echo "Creating veth network ..."
-        ${iproute}/bin/ip link add name vethwghost0 type veth peer vethwgns0 netns wg
-        ${iproute}/bin/ip address add 192.168.42.1/24 dev vethwghost0
-        ${iproute}/bin/ip -n wg address add 192.168.42.2/24 dev vethwgns0
-        ${iproute}/bin/ip link set vethwghost0 up
-        ${iproute}/bin/ip -n wg link set vethwgns0 up
+        ${iproute2}/bin/ip link add name vethwghost0 type veth peer vethwgns0 netns wg
+        ${iproute2}/bin/ip address add 192.168.42.1/24 dev vethwghost0
+        ${iproute2}/bin/ip -n wg address add 192.168.42.2/24 dev vethwgns0
+        ${iproute2}/bin/ip link set vethwghost0 up
+        ${iproute2}/bin/ip -n wg link set vethwgns0 up
         echo "Creating wg0 interface ..."
-        ${iproute}/bin/ip link add wg0 type wireguard
+        ${iproute2}/bin/ip link add wg0 type wireguard
         ${wireguard-tools}/bin/wg setconf wg0 ${config.age.secrets.wireguard-config.path}
-        ${iproute}/bin/ip link set wg0 netns wg
-        ${iproute}/bin/ip -n wg address add ${secret.wireguard.ipv4} dev wg0
-        ${iproute}/bin/ip -n wg -6 address add ${secret.wireguard.ipv6} dev wg0
-        ${iproute}/bin/ip -n wg link set wg0 mtu 1320
-        ${iproute}/bin/ip -n wg link set wg0 up
-        ${iproute}/bin/ip -n wg route add default dev wg0
-        ${iproute}/bin/ip -n wg -6 route add default dev wg0
+        ${iproute2}/bin/ip link set wg0 netns wg
+        ${iproute2}/bin/ip -n wg address add ${secret.wireguard.ipv4} dev wg0
+        ${iproute2}/bin/ip -n wg -6 address add ${secret.wireguard.ipv6} dev wg0
+        ${iproute2}/bin/ip -n wg link set wg0 mtu 1320
+        ${iproute2}/bin/ip -n wg link set wg0 up
+        ${iproute2}/bin/ip -n wg route add default dev wg0
+        ${iproute2}/bin/ip -n wg -6 route add default dev wg0
         echo "Done!"
       '';
       ExecStop = with pkgs; writers.writeBash "wg-down" ''
         echo "Tearing down wg0 ..."
-        ${iproute}/bin/ip -n wg route del default dev wg0
-        ${iproute}/bin/ip -n wg -6 route del default dev wg0
-        ${iproute}/bin/ip -n wg link del wg0
+        ${iproute2}/bin/ip -n wg route del default dev wg0
+        ${iproute2}/bin/ip -n wg -6 route del default dev wg0
+        ${iproute2}/bin/ip -n wg link del wg0
         echo "Tearing down veth network ..."
-        ${iproute}/bin/ip link del vethwghost0
-        ${iproute}/bin/ip -n wg link del vethwgns0
+        ${iproute2}/bin/ip link del vethwghost0
+        ${iproute2}/bin/ip -n wg link del vethwgns0
         echo "Setting lo to down ..."
-        ${iproute}/bin/ip -n wg link set lo down
+        ${iproute2}/bin/ip -n wg link set lo down
         echo "Done!"
       '';
     };