diff options
| author | Will Fancher <elvishjerricco@gmail.com> | 2023-07-03 13:38:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-03 13:38:12 -0400 |
| commit | 73a8ca16748f510cfc5be5f66f12332b8b56f187 (patch) | |
| tree | d07195cb4765d4a60fdd88a597b1e2272f04f6ea /nixos/modules/tasks | |
| parent | 453da3c28f7a95374b73d1f3fd665dd40e6049e9 (diff) | |
| parent | e9207b05011b7cf46face625a4f69c946688902b (diff) | |
| download | nixpkgs-73a8ca16748f510cfc5be5f66f12332b8b56f187.tar nixpkgs-73a8ca16748f510cfc5be5f66f12332b8b56f187.tar.gz nixpkgs-73a8ca16748f510cfc5be5f66f12332b8b56f187.tar.bz2 nixpkgs-73a8ca16748f510cfc5be5f66f12332b8b56f187.tar.lz nixpkgs-73a8ca16748f510cfc5be5f66f12332b8b56f187.tar.xz nixpkgs-73a8ca16748f510cfc5be5f66f12332b8b56f187.tar.zst nixpkgs-73a8ca16748f510cfc5be5f66f12332b8b56f187.zip | |
Merge pull request #240601 from lilyinstarlight/fix/lvm-root-sd-stage-1-unhide
nixos/*: unhide remaining systemd stage-1 options
Diffstat (limited to 'nixos/modules/tasks')
| -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 |
3 files changed, 18 insertions, 6 deletions
diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix index 408ddc02373..35b922dc8a1 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 a14f26c02e4..4bf960a93d9 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 7832bbf9201..1c3f1db1509 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 { |