Merge staging-next into staging

nixos/modules/tasks/filesystems.nix

@@ -32,6 +32,10 @@ let
   coreFileSystemOpts = { name, config, ... }: {
 
     options = {
+      enable = mkEnableOption "the filesystem mount" // {
+        default = true;
+      };
+
       mountPoint = mkOption {
         example = "/mnt/usb";
         type = nonEmptyWithoutTrailingSlash;
@@ -234,6 +238,7 @@ in
         }
       '';
       type = types.attrsOf (types.submodule [coreFileSystemOpts fileSystemOpts]);
+      apply = lib.filterAttrs (_: fs: fs.enable);
       description = ''
         The file systems to be mounted.  It must include an entry for
         the root directory (`mountPoint = "/"`).  Each
@@ -280,6 +285,7 @@ in
     boot.specialFileSystems = mkOption {
       default = {};
       type = types.attrsOf (types.submodule coreFileSystemOpts);
+      apply = lib.filterAttrs (_: fs: fs.enable);
       internal = true;
       description = ''
         Special filesystems that are mounted very early during boot.

nixos/modules/tasks/filesystems/overlayfs.nix

@@ -1,17 +1,29 @@
-{ config, lib, pkgs, utils, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  utils,
+  ...
+}:
 
 let
   # The scripted initrd contains some magic to add the prefix to the
   # paths just in time, so we don't add it here.
-  sysrootPrefix = fs:
-    if config.boot.initrd.systemd.enable && (utils.fsNeededForBoot fs) then
+  sysrootPrefix =
+    fs:
+    if
+      config.boot.initrd.systemd.enable
+      && fs.overlay.useStage1BaseDirectories
+      && (utils.fsNeededForBoot fs)
+    then
       "/sysroot"
     else
       "";
 
   # Returns a service that creates the required directories before the mount is
   # created.
-  preMountService = _name: fs:
+  preMountService =
+    _name: fs:
     let
       prefix = sysrootPrefix fs;
 
@@ -21,89 +33,111 @@ let
       upperdir = prefix + fs.overlay.upperdir;
       workdir = prefix + fs.overlay.workdir;
     in
-    lib.mkIf (fs.overlay.upperdir != null)
-      {
-        "rw-${escapedMountpoint}" = {
-          requiredBy = [ mountUnit ];
-          before = [ mountUnit ];
-          unitConfig = {
-            DefaultDependencies = false;
-            RequiresMountsFor = "${upperdir} ${workdir}";
-          };
-          serviceConfig = {
-            Type = "oneshot";
-            ExecStart = "${pkgs.coreutils}/bin/mkdir -p -m 0755 ${upperdir} ${workdir}";
-          };
+    lib.mkIf (fs.overlay.upperdir != null) {
+      "rw-${escapedMountpoint}" = {
+        requiredBy = [ mountUnit ];
+        before = [ mountUnit ];
+        unitConfig = {
+          DefaultDependencies = false;
+          RequiresMountsFor = "${upperdir} ${workdir}";
+        };
+        serviceConfig = {
+          Type = "oneshot";
+          ExecStart = "${pkgs.coreutils}/bin/mkdir -p -m 0755 ${upperdir} ${workdir}";
+        };
+      };
+    };
+
+  overlayOpts =
+    {
+      config,
+      ...
+    }:
+    {
+      options.overlay = {
+        lowerdir = lib.mkOption {
+          type = with lib.types; nullOr (nonEmptyListOf (either str pathInStore));
+          default = null;
+          description = ''
+            The list of path(s) to the lowerdir(s).
+
+            To create a writable overlay, you MUST provide an `upperdir` and a
+            `workdir`.
+
+            You can create a read-only overlay when you provide multiple (at
+            least 2!) lowerdirs and neither an `upperdir` nor a `workdir`.
+          '';
+        };
+
+        upperdir = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+          description = ''
+            The path to the upperdir.
+
+            If this is null, a read-only overlay is created using the lowerdir.
+
+            If the filesystem is `neededForBoot`, this will be prefixed with `/sysroot`,
+            unless `useStage1BaseDirectories` is set to `true`.
+
+            If you set this to some value you MUST also set `workdir`.
+          '';
+        };
+
+        workdir = lib.mkOption {
+          type = lib.types.nullOr lib.types.str;
+          default = null;
+          description = ''
+            The path to the workdir.
+
+            If the filesystem is `neededForBoot`, this will be prefixed with `/sysroot`,
+            unless `useStage1BaseDirectories` is set to `true`.
+
+            This MUST be set if you set `upperdir`.
+          '';
+        };
+
+        useStage1BaseDirectories = lib.mkOption {
+          type = lib.types.bool;
+          default = true;
+          description = ''
+            If enabled, `lowerdir`, `upperdir` and `workdir` will be prefixed with `/sysroot`.
+
+            Disabling this can be useful to create an overlay over directories which aren't on the real root.
+
+            Disabling this does not work with the scripted (i.e. non-systemd) initrd.
+          '';
         };
       };
 
-  overlayOpts = { config, ... }: {
+      config = lib.mkIf (config.overlay.lowerdir != null) {
+        fsType = "overlay";
+        device = lib.mkDefault "overlay";
+        depends = map (x: "${x}") (
+          config.overlay.lowerdir
+          ++ lib.optionals (config.overlay.upperdir != null) [
+            config.overlay.upperdir
+            config.overlay.workdir
+          ]
+        );
 
-    options.overlay = {
+        options =
+          let
+            prefix = sysrootPrefix config;
 
-      lowerdir = lib.mkOption {
-        type = with lib.types; nullOr (nonEmptyListOf (either str pathInStore));
-        default = null;
-        description = ''
-          The list of path(s) to the lowerdir(s).
-
-          To create a writable overlay, you MUST provide an upperdir and a
-          workdir.
-
-          You can create a read-only overlay when you provide multiple (at
-          least 2!) lowerdirs and neither an upperdir nor a workdir.
-        '';
+            lowerdir = map (s: prefix + s) config.overlay.lowerdir;
+            upperdir = prefix + config.overlay.upperdir;
+            workdir = prefix + config.overlay.workdir;
+          in
+          [
+            "lowerdir=${lib.concatStringsSep ":" lowerdir}"
+          ]
+          ++ lib.optionals (config.overlay.upperdir != null) [
+            "upperdir=${upperdir}"
+            "workdir=${workdir}"
+          ];
       };
-
-      upperdir = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
-        default = null;
-        description = ''
-          The path to the upperdir.
-
-          If this is null, a read-only overlay is created using the lowerdir.
-
-          If you set this to some value you MUST also set `workdir`.
-        '';
-      };
-
-      workdir = lib.mkOption {
-        type = lib.types.nullOr lib.types.str;
-        default = null;
-        description = ''
-          The path to the workdir.
-
-          This MUST be set if you set `upperdir`.
-        '';
-      };
-
     };
-
-    config = lib.mkIf (config.overlay.lowerdir != null) {
-      fsType = "overlay";
-      device = lib.mkDefault "overlay";
-      depends = map (x: "${x}") (config.overlay.lowerdir ++ lib.optionals (config.overlay.upperdir != null) [
-        config.overlay.upperdir
-        config.overlay.workdir
-      ]);
-
-      options =
-        let
-          prefix = sysrootPrefix config;
-
-          lowerdir = map (s: prefix + s) config.overlay.lowerdir;
-          upperdir = prefix + config.overlay.upperdir;
-          workdir = prefix + config.overlay.workdir;
-        in
-        [
-          "lowerdir=${lib.concatStringsSep ":" lowerdir}"
-        ] ++ lib.optionals (config.overlay.upperdir != null) [
-          "upperdir=${upperdir}"
-          "workdir=${workdir}"
-        ];
-    };
-
-  };
 in
 
 {
@@ -140,6 +174,13 @@ in
                 -> (lib.length fs.overlay.lowerdir) >= 2;
               message = "A read-only overlay (without an `upperdir`) requires at least 2 `lowerdir`s: ${fs.mountPoint}";
             }
+            {
+              assertion = !fs.overlay.useStage1BaseDirectories -> config.boot.initrd.systemd.enable;
+              message = ''
+                Stage 1 overlay file system ${fs.mountPoint} has 'useStage1BaseDirectories' set to false,
+                which is not supported with scripted initrd. Please enable 'boot.initrd.systemd.enable'.
+              '';
+            }
           ]) overlayFileSystems
         )
         ++ lib.mapAttrsToList (_: fs: {

nixos/modules/tasks/filesystems/zfs.nix

@@ -889,6 +889,7 @@ in
         after = [ "zfs-import.target" ];
         serviceConfig = {
           Type = "simple";
+          IOSchedulingClass = "idle";
         };
         script = ''
           # shellcheck disable=SC2046