synit: assert from mdevd

nixos/modules/synit/boot/stage-1-init.sh

@@ -234,9 +234,6 @@ for i in @kernelModules@; do
     modprobe $i
 done
 
-info "loading modules from modalias files..."
-find /sys -name 'modalias' -type f -exec cat '{}' + | sort -u | xargs modprobe -b -a 2>/dev/null
-
 
 # Create device nodes in /dev.
 @preDeviceCommands@
@@ -247,6 +244,7 @@ ln -sfn /proc/self/fd/2 /dev/stderr
 mkdir -p /dev/.mdadm
 
 info "running mdevd..."
+echo '$MODALIAS=.* 0:0 660 @modprobe "$MODALIAS"' >/etc/mdev.conf
 mdevd -O4 -v 3 &
 mdevd_pid=$!
 mdevd-coldplug -O4 -v 3

nixos/modules/synit/boot/stage-1.nix

@@ -350,9 +350,6 @@ let
         { object = pkgs.kmod-debian-aliases;
           symlink = "/etc/modprobe.d/debian.conf";
         }
-       { object = config.system.build.mdevConf;
-         symlink = "/etc/mdev.conf";
-       }
       ] ++ lib.optionals config.services.multipath.enable [
         { object = pkgs.runCommand "multipath.conf" {
               src = config.environment.etc."multipath.conf".text;
@@ -423,16 +420,12 @@ let
         (cd "$tmp" && find . -print0 | sort -z | bsdtar --uid 0 --gid 0 -cnf - -T - | bsdtar --null -cf - --format=newc @-) | \
           ${compressorExe} ${lib.escapeShellArgs initialRamdisk.compressorArgs} >> "$1"
       '';
-
-  mdevConf = builtins.toFile "mdev.conf" ''
-    .* 0:0 777
-  '';
 in
 
 {
   config = mkIf config.boot.initrd.enable {
 
-    system.build = lib.mapAttrs (_: lib.mkForce) { inherit bootStage1 initialRamdisk initialRamdiskSecretAppender extraUtils mdevConf; };
+    system.build = lib.mapAttrs (_: lib.mkForce) { inherit bootStage1 initialRamdisk initialRamdiskSecretAppender extraUtils; };
 
   };
 }

nixos/modules/synit/boot/stage-2-init.sh

@@ -126,6 +126,7 @@ mkdir -p \
   /etc/syndicate/user-settings \
   /run/etc/syndicate/core \
   /run/etc/syndicate/services \
+  /run/etc/syndicate/machine \
 
 # Start Synit.
 echo "starting Synit..."

nixos/modules/synit/etc/core/machine-dataspace.pr

@@ -5,3 +5,5 @@ $ds ? ?r [
   $log ! <log "-" { line: "machine" |+++|: $r }>
   ?- $log ! <log "-" { line: "machine" |---|: $r }>
 ]
+
+<require-service <config-watcher "/run/etc/syndicate/machine" { config: $ds }>>

nixos/modules/synit/etc/core/mdevd.pr

@@ -1,6 +1,9 @@
 <require-service <daemon mdevd>>
-<daemon mdevd ["@mdevd@/bin/mdevd" "-v" "3"]>
+<daemon mdevd {
+    argv: ["@mdevd@/bin/mdevd" "-v" "9" "-f" "@mdevdConf@"]
+    env: { PATH: "@mdevdPath@" }
+  }>
 
 <require-service <daemon mdevd-coldplug>>
 <depends-on <daemonmdevd-coldplug> <service-state <daemon mdevd> up>>
-<daemon mdevd-coldplug <one-shot ["@mdevd@/bin/mdevd-coldplug" "-v" "3"]>>
+<daemon mdevd-coldplug <one-shot ["@mdevd@/bin/mdevd-coldplug" "-v" "9"]>>

nixos/modules/synit/etc/default.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   substituteDirectory = args:
@@ -11,10 +11,6 @@ let
 in {
   environment.etc = {
 
-    "mdev.conf".text = ''
-      .* 0:0 660
-    '';
-
     "syndicate/boot".source = substituteDirectory {
       src = ./boot;
       getty = "${pkgs.busybox}/bin/busybox getty";
@@ -23,10 +19,14 @@ in {
 
     "syndicate/core".source = substituteDirectory {
       src = ./core;
-      inherit (pkgs) mdevd;
       hostnameOneShot =
         "${pkgs.busybox}/bin/busybox hostname ${config.networking.hostName}";
-    };
 
+      inherit (pkgs) mdevd;
+      mdevdConf = pkgs.writeText "mdevd.conf" ''
+        .* 0:0 660 &importas -i MDEV MDEV backtick -E mdevdir { basename -- $MDEV } if { mkdir -p /run/etc/syndicate/machine/''${mdevdir} } redirfd -w 1 /run/etc/syndicate/machine/''${MDEV}.pr ${pkgs.nimPackages.syndicate_utils}/bin/preserve_process_environment
+      '';
+      mdevdPath = lib.strings.makeBinPath [ pkgs.execline pkgs.busybox ];
+    };
   };
 }

nixos/modules/synit/etc/substitute-dir.sh

@@ -5,7 +5,6 @@ eval "$preInstall"
 pushd $src || exit
 find ./* -type f | while read filepath
 do
-  echo "find file $filepath"
   fileout=$out/$filepath
   dirout=$(dirname "$fileout")
   mkdir -p "$dirout"

packages/syndicate_utils-nim/default.nix

@@ -2,14 +2,14 @@
 
 buildNimPackage rec {
   pname = "syndicate_utils";
-  version = "20230518";
+  version = "20230701";
 
   src = fetchFromGitea {
     domain = "git.syndicate-lang.org";
     owner = "ehmry";
     repo = pname;
     rev = version;
-    hash = "sha256-syYxxsl7rbE1FdFsT6ib3eUbxG6nOxbavo04ZzlTFOs=";
+    hash = "sha256-lkgYogxQOoVX8gywdty8sgYv9oHl8b8r+SIv/I6pCno=";
   };
 
   propagatedBuildInputs = [ syndicate ];