Unverified Commit 73a8ca16 authored by Will Fancher's avatar Will Fancher Committed by GitHub
Browse files

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

nixos/*: unhide remaining systemd stage-1 options
parents 453da3c2 e9207b05

nixos/modules/config/users-groups.nix

+0 −5
Original line number Diff line number Diff line
@@ -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.

nixos/modules/services/hardware/udev.nix

+0 −2
Original line number Diff line number Diff line
@@ -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.*

nixos/modules/services/system/dbus.nix

+1 −1
Original line number Diff line number Diff line
@@ -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 = {

nixos/modules/tasks/bcache.nix

+6 −2
Original line number Diff line number Diff line 
{ 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 = {

nixos/modules/tasks/lvm.nix

+6 −2
Original line number Diff line number Diff line
@@ -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 [