b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #240601 from lilyinstarlight/fix/lvm-root-sd-stage-1-unhide

Browse source 
nixos/*: unhide remaining systemd stage-1 options
This commit is contained in:
Will Fancher 2023-07-03 13:38:12 -04:00 committed by GitHub
parent 453da3c28f e9207b0501
commit 73a8ca1674
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
nixos/modules/config/users-groups.nix
View file

@ -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.

2
nixos/modules/services/hardware/udev.nix
View file

@ -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.*

2
nixos/modules/services/system/dbus.nix
View file

@ -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 = {

8
nixos/modules/tasks/bcache.nix
View file

@ -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 = {

8
nixos/modules/tasks/lvm.nix
View file

@ -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 [

8
nixos/modules/tasks/swraid.nix
View file

@ -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 {