liminix

commit bf0cafffedd6999959a33530825760e52af3fb84
parent e49aba127c63f4d4fbd09fba2019707899445477
Author: Daniel Barlow <dan@telent.net>
Date:   Fri, 26 Apr 2024 20:52:12 +0100

start devout alongside mdevd

ensure it starts before mdevd-coldplug so it can populate
its database

Diffstat:
M
modules/mdevd.nix
 | 
10
++++++++--
M
pkgs/devout/devout.fnl
 | 
1
-

2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/modules/mdevd.nix b/modules/mdevd.nix
@@ -1,5 +1,5 @@
 { config, pkgs, lib, ...} :
-let inherit (pkgs.liminix.services) oneshot longrun bundle target;
+let inherit (pkgs.liminix.services) oneshot longrun;
 in {
   config = {
     services = rec {
@@ -8,9 +8,15 @@ in {
         notification-fd = 3;
         run = "${pkgs.mdevd}/bin/mdevd -D 3 -b 200000 -O4";
       };
+      devout = longrun {
+        name = "devout";
+        notification-fd = 10;
+        run = "${pkgs.devout}/bin/devout /run/devout.sock 4";
+      };
       mdevd-coldplug = oneshot {
         name ="mdev-coldplug";
-        up = "${pkgs.mdevd}/bin/mdevd-coldplug";
+        up = "${pkgs.mdevd}/bin/mdevd-coldplug -O 4";
+        dependencies = [devout];
       };
     };
   };
diff --git a/pkgs/devout/devout.fnl b/pkgs/devout/devout.fnl
@@ -104,7 +104,6 @@
       (values fd (if (> revent 0) revent nil)))))
 
 (fn parse-terms [str]
-  (print :terms str)
   (collect [n (string.gmatch (str:gsub "\n+$" "") "([^ ]+)")]
     (string.match n "(.-)=(.+)")))