liminix

commit 9aa5ff6ed12078a2c5aa66a2fc9513d8b68f735a
parent b6e72504d62e2f68c8c3d445f0215b98ad289268
Author: Daniel Barlow <dan@telent.net>
Date:   Fri, 30 Jun 2023 20:02:03 +0100

make a package for odhcpc-script

Diffstat:
M
examples/rotuer.nix
 | 
3
+--
M
pkgs/default.nix
 | 
1
+
A
pkgs/odhcp-script/default.nix
 | 
4
++++
R
examples/odhcp6-script.fnl -> pkgs/odhcp-script/odhcp6-script.fnl
 | 
0

4 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/examples/rotuer.nix b/examples/rotuer.nix
@@ -284,13 +284,12 @@ in rec {
   services.dhcp6 =
     let
       name = "dhcp6c.wan";
-      luafile = writeFennelScript "odhcpc-script" [] ./odhcp6-script.fnl;
     in longrun {
       inherit name;
       notification-fd = 10;
       run = ''
         export SERVICE_STATE=/run/service-state/${name}
-        ${pkgs.odhcp6c}/bin/odhcp6c -s ${luafile} -e -v -p /run/${name}.pid -P 48 $(output ${services.wan} ifname)
+        ${pkgs.odhcp6c}/bin/odhcp6c -s ${pkgs.odhcp-script} -e -v -p /run/${name}.pid -P 48 $(output ${services.wan} ifname)
         )
       '';
       dependencies = [ services.wan ];
diff --git a/pkgs/default.nix b/pkgs/default.nix
@@ -55,4 +55,5 @@
   hi = callPackage ./hi {};
   firewallgen  = callPackage ./firewallgen {};
   kernel-modules  = callPackage ./kernel-modules {};
+  odhcp-script = callPackage ./odhcp-script {};
 }
diff --git a/pkgs/odhcp-script/default.nix b/pkgs/odhcp-script/default.nix
@@ -0,0 +1,4 @@
+{
+  writeFennelScript
+}:
+writeFennelScript  "odhcpc-script" [] ./odhcp6-script.fnl
diff --git a/examples/odhcp6-script.fnl b/pkgs/odhcp-script/odhcp6-script.fnl