diff options
author | Lily Foster <lily@lily.flowers> | 2023-07-03 08:41:38 -0400 |
---|---|---|
committer | Lily Foster <lily@lily.flowers> | 2023-07-03 08:41:38 -0400 |
commit | e9207b05011b7cf46face625a4f69c946688902b (patch) | |
tree | 5ea2ea1120e0fea939fddd014a2f44f04c01a95b /nixos | |
parent | 46e3229c8daf402f70a698298585a380ec2e18ca (diff) |
nixos/*: unhide remaining systemd stage-1 options
These options were missed in NixOS/nixpkgs#226237, but they all were specifically added for systemd stage-1.
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/modules/config/users-groups.nix | 5 | ||||
-rw-r--r-- | nixos/modules/services/hardware/udev.nix | 2 | ||||
-rw-r--r-- | nixos/modules/services/system/dbus.nix | 2 | ||||
-rw-r--r-- | nixos/modules/tasks/bcache.nix | 8 | ||||
-rw-r--r-- | nixos/modules/tasks/lvm.nix | 8 | ||||
-rw-r--r-- | nixos/modules/tasks/swraid.nix | 8 |
6 files changed, 19 insertions, 14 deletions
diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 4640a0f3d6bef..4c9e286ea5fd4 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -539,14 +539,12 @@ in { # systemd initrd boot.initrd.systemd.users = mkOption { - visible = false; description = '' Users to include in initrd. ''; default = {}; type = types.attrsOf (types.submodule ({ name, ... }: { options.uid = mkOption { - visible = false; type = types.int; description = '' ID of the user in initrd. @@ -555,7 +553,6 @@ in { default = cfg.users.${name}.uid; }; options.group = mkOption { - visible = false; type = types.singleLineStr; description = '' Group the user belongs to in initrd. @@ -567,14 +564,12 @@ in { }; boot.initrd.systemd.groups = mkOption { - visible = false; description = '' Groups to include in initrd. ''; default = {}; type = types.attrsOf (types.submodule ({ name, ... }: { options.gid = mkOption { - visible = false; type = types.int; description = '' ID of the group in initrd. diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index e3451e1f6c7d6..56120094871cc 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -296,7 +296,6 @@ in packages = mkOption { type = types.listOf types.path; default = []; - visible = false; description = lib.mdDoc '' *This will only be used when systemd is used in stage 1.* @@ -311,7 +310,6 @@ in binPackages = mkOption { type = types.listOf types.path; default = []; - visible = false; description = lib.mdDoc '' *This will only be used when systemd is used in stage 1.* diff --git a/nixos/modules/services/system/dbus.nix b/nixos/modules/services/system/dbus.nix index 9d8a62ec78c53..8d5b25e617625 100644 --- a/nixos/modules/services/system/dbus.nix +++ b/nixos/modules/services/system/dbus.nix @@ -22,7 +22,7 @@ in options = { boot.initrd.systemd.dbus = { - enable = mkEnableOption (lib.mdDoc "dbus in stage 1") // { visible = false; }; + enable = mkEnableOption (lib.mdDoc "dbus in stage 1"); }; services.dbus = { diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix index 408ddc02373ff..35b922dc8a1d3 100644 --- a/nixos/modules/tasks/bcache.nix +++ b/nixos/modules/tasks/bcache.nix @@ -1,8 +1,12 @@ { config, lib, pkgs, ... }: { - options.boot.initrd.services.bcache.enable = (lib.mkEnableOption (lib.mdDoc "bcache support in the initrd")) // { - visible = false; # only works with systemd stage 1 + options.boot.initrd.services.bcache.enable = lib.mkEnableOption (lib.mdDoc "bcache support in the initrd") // { + description = lib.mdDoc '' + *This will only be used when systemd is used in stage 1.* + + Whether to enable bcache support in the initrd. + ''; }; config = { diff --git a/nixos/modules/tasks/lvm.nix b/nixos/modules/tasks/lvm.nix index a14f26c02e48f..4bf960a93d9bb 100644 --- a/nixos/modules/tasks/lvm.nix +++ b/nixos/modules/tasks/lvm.nix @@ -25,8 +25,12 @@ in { boot.vdo.enable = mkEnableOption (lib.mdDoc "support for booting from VDOLVs"); }; - options.boot.initrd.services.lvm.enable = (mkEnableOption (lib.mdDoc "enable booting from LVM2 in the initrd")) // { - visible = false; + options.boot.initrd.services.lvm.enable = mkEnableOption (lib.mdDoc "booting from LVM2 in the initrd") // { + description = lib.mdDoc '' + *This will only be used when systemd is used in stage 1.* + + Whether to enable booting from LVM2 in the initrd. + ''; }; config = mkMerge [ diff --git a/nixos/modules/tasks/swraid.nix b/nixos/modules/tasks/swraid.nix index 7832bbf920165..1c3f1db15099d 100644 --- a/nixos/modules/tasks/swraid.nix +++ b/nixos/modules/tasks/swraid.nix @@ -5,8 +5,12 @@ in { options.boot.initrd.services.swraid = { - enable = (lib.mkEnableOption (lib.mdDoc "swraid support using mdadm")) // { - visible = false; # only has effect when the new stage 1 is in place + enable = lib.mkEnableOption (lib.mdDoc "swraid support using mdadm") // { + description = '' + *This will only be used when systemd is used in stage 1.* + + Whether to enable swraid support using mdadm. + ''; }; mdadmConf = lib.mkOption { |