modules/systemd-extras: init

modules/external-storage/strict-mounts.nix

@@ -8,10 +8,6 @@ with lib;
 {
   options.systemd.services = mkOption {
     type = with types; attrsOf (submodule ({ config, ... }: {
-      options.strictMounts = mkOption {
-        type = with types; listOf path;
-        default = [];
-      };
       config = mkIf (config.strictMounts != []) (let
         findFilesystemsFor = mount: pipe cfg.fileSystems [
           (filterAttrs (_: fs: hasPrefix "${fs.mountpoint}/" "${mount}/"))

modules/part.nix

@@ -29,6 +29,7 @@ in
     ssh = ./ssh;
     system-info = ./system-info;
     system-recovery = ./system-recovery;
+    systemd-extras = ./systemd-extras;
     tested = ./tested;
 
     machineBase = group [
@@ -38,6 +39,7 @@ in
       minimal
       port-magic
       ssh
+      systemd-extras
     ];
 
     serverBase = group [

modules/systemd-extras/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./strict-mounts.nix
+  ];
+}

modules/systemd-extras/strict-mounts.nix

@@ -0,0 +1,17 @@
+{ lib, ... }:
+
+with lib;
+{
+  options.systemd.services = mkOption {
+    type = with types; attrsOf (submodule ({ config, ... }: {
+      options.strictMounts = mkOption {
+        description = "Mount points which this service strictly depends on. What that means is up to other modules.";
+        type = with types; listOf path;
+        default = [];
+      };
+      config = mkIf (config.strictMounts != []) {
+        unitConfig.RequiresMountsFor = config.strictMounts;
+      };
+    }));
+  };
+}