From ccc7796402ccdb9e2c10d6f7ebd46957d23b3cbb Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Sun, 6 Mar 2022 10:51:05 +0100
Subject: Revert "tinc: use ip from path"

This reverts commit 332d4f5e1719df2b27f835c4fd0718317867043c.
---
 krebs/3modules/tinc.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'krebs/3modules/tinc.nix')

diff --git a/krebs/3modules/tinc.nix b/krebs/3modules/tinc.nix
index 96d17e2d..8fb8961c 100644
--- a/krebs/3modules/tinc.nix
+++ b/krebs/3modules/tinc.nix
@@ -27,7 +27,7 @@ with import <stockholm/lib>;
                 ${tinc.config.extraConfig}
               '';
               "tinc-up" = pkgs.writeDash "${netname}-tinc-up" ''
-                ip link set ${netname} up
+                ${tinc.config.iproutePackage}/sbin/ip link set ${netname} up
                 ${tinc.config.tincUp}
               '';
             });
@@ -59,14 +59,15 @@ with import <stockholm/lib>;
           type = types.str;
           default = let
             net = tinc.config.host.nets.${netname};
+            iproute = tinc.config.iproutePackage;
           in ''
             ${optionalString (net.ip4 != null) /* sh */ ''
-              ip -4 addr add ${net.ip4.addr} dev ${netname}
-              ip -4 route add ${net.ip4.prefix} dev ${netname}
+              ${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${netname}
+              ${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${netname}
             ''}
             ${optionalString (net.ip6 != null) /* sh */ ''
-              ip -6 addr add ${net.ip6.addr} dev ${netname}
-              ip -6 route add ${net.ip6.prefix} dev ${netname}
+              ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${netname}
+              ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${netname}
             ''}
             ${tinc.config.tincUpExtra}
           '';
-- 
cgit v1.2.3