diff options
| author | lassulus <lass@aidsballs.de> | 2016-06-13 13:50:52 +0200 |
|---|---|---|
| committer | lassulus <lass@aidsballs.de> | 2016-06-13 13:50:52 +0200 |
| commit | 23385c2984c9d4fbff65c920d9d59bc29314a639 (patch) | |
| tree | d7e4f635be78922359b21970f6a6c8731995e38d /krebs/3modules/retiolum.nix | |
| parent | de43b0e6f50e4d044cc0609a3d7d7c7d869552fe (diff) | |
| parent | 2dd4dbbf6ea77972c7d5edb0ec25b8e778bfeb50 (diff) | |
Merge remote-tracking branch 'cd/master'
Diffstat (limited to 'krebs/3modules/retiolum.nix')
| -rw-r--r-- | krebs/3modules/retiolum.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/krebs/3modules/retiolum.nix b/krebs/3modules/retiolum.nix index 5a035fa50..22991f093 100644 --- a/krebs/3modules/retiolum.nix +++ b/krebs/3modules/retiolum.nix @@ -159,13 +159,13 @@ let PrivateKeyFile = ${cfg.privkey.path} ${cfg.extraConfig} ''; - "tinc-up" = pkgs.writeScript "${cfg.netname}-tinc-up" '' + "tinc-up" = pkgs.writeDash "${cfg.netname}-tinc-up" '' ${iproute}/sbin/ip link set ${cfg.netname} up - ${optionalString (net.ip4 != null) '' + ${optionalString (net.ip4 != null) /* sh */ '' ${iproute}/sbin/ip -4 addr add ${net.ip4.addr} dev ${cfg.netname} ${iproute}/sbin/ip -4 route add ${net.ip4.prefix} dev ${cfg.netname} ''} - ${optionalString (net.ip6 != null) '' + ${optionalString (net.ip6 != null) /* sh */ '' ${iproute}/sbin/ip -6 addr add ${net.ip6.addr} dev ${cfg.netname} ${iproute}/sbin/ip -6 route add ${net.ip6.prefix} dev ${cfg.netname} ''} |