about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authorsefidel <contact@sefidel.net>2024-06-15 11:27:45 +0900
committersefidel <contact@sefidel.net>2024-06-24 23:43:11 +0900
commit3afab2d909ff44a91bfe382cf1f9ed55122245d4 (patch)
treefd8c0b67d3e6b6354b0f8f61cf2ebbc4e57183df /modules
parent570f5f8be9371241b80ac147b464c8a97141e57f (diff)
downloadnixrc-3afab2d909ff44a91bfe382cf1f9ed55122245d4.tar.gz
nixrc-3afab2d909ff44a91bfe382cf1f9ed55122245d4.zip
fix(modules/tailscale-initrd): fix binary paths
Breaking change introduced on https://github.com/NixOS/nixpkgs/commit/ccf4d0c623495168171bee72f511d7e56b4cdc84
Diffstat (limited to 'modules')
-rw-r--r--modules/tailscale-initrd.nix14
1 files changed, 7 insertions, 7 deletions
diff --git a/modules/tailscale-initrd.nix b/modules/tailscale-initrd.nix
index 4b7610e..4429d60 100644
--- a/modules/tailscale-initrd.nix
+++ b/modules/tailscale-initrd.nix
@@ -53,10 +53,10 @@
             echo 'nameserver 8.8.8.8' > /etc/resolv.conf
             mkdir /dev/net
             mknod /dev/net/tun c 10 200
-            .tailscaled-wrapped 2>/dev/null &
+            tailscaled 2>/dev/null &
             sleep 5
-            .tailscale-wrapped up
-            .tailscale-wrapped status
+            tailscale up
+            tailscale status
 
             echo "echo 'Use cryptsetup-askpass to unlock!'" >> /root/.profile
           '';
@@ -81,8 +81,8 @@
           "xt_tcpudp"
         ];
         extraUtilsCommands = ''
-          copy_bin_and_libs ${pkgs.tailscale}/bin/.tailscaled-wrapped
-          copy_bin_and_libs ${pkgs.tailscale}/bin/.tailscale-wrapped
+          copy_bin_and_libs ${pkgs.tailscale}/bin/tailscaled
+          copy_bin_and_libs ${pkgs.tailscale}/bin/tailscale
           copy_bin_and_libs ${pkgs.iproute}/bin/ip
           copy_bin_and_libs ${iptables-static}/bin/iptables
           copy_bin_and_libs ${iptables-static}/bin/xtables-legacy-multi
@@ -91,8 +91,8 @@
         '';
         postMountCommands = ''
           # tear down tailscale
-          pkill .tailscaled-wrapped
-          .tailscaled-wrapped --cleanup
+          pkill tailscaled
+          tailscaled --cleanup
         '';
       };
     };