Unverified Commit 18be00a2 authored by Janne Heß's avatar Janne Heß Committed by GitHub
Browse files

Merge pull request #207801 from ElvishJerricco/systemd-stage-1-test-instrumentation 

systemd-stage-1: Improve test-instrumentation output
parents adfc8fec 9a497aab

nixos/modules/system/boot/systemd/initrd.nix

+11 −0
Original line number Diff line number Diff line
@@ -148,6 +148,16 @@ in { 
      visible = false;

    };



    extraConfig = mkOption {

      default = "";

      type = types.lines;

      example = "DefaultLimitCORE=infinity";

      description = lib.mdDoc ''

        Extra config options for systemd. See systemd-system.conf(5) man page

        for available options.

      '';

    };



    contents = mkOption {

      description = lib.mdDoc "Set of files that have to be linked into the initrd";

      example = literalExpression ''
@@ -352,6 +362,7 @@ in { 
        "/etc/systemd/system.conf".text = ''

          [Manager]

          DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"}

          ${cfg.extraConfig}

        '';



        "/lib/modules".source = "${modulesClosure}/lib/modules";

nixos/modules/testing/test-instrumentation.nix

+8 −0
Original line number Diff line number Diff line
@@ -96,6 +96,12 @@ in 
        MaxLevelConsole=debug

      '';



    boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = ''

      [Journal]

      ForwardToConsole=yes

      MaxLevelConsole=debug

    '';



    systemd.extraConfig = ''

      # Don't clobber the console with duplicate systemd messages.

      ShowStatus=no
@@ -107,6 +113,8 @@ in 
      DefaultTimeoutStartSec=300

    '';



    boot.initrd.systemd.extraConfig = config.systemd.extraConfig;



    boot.consoleLogLevel = 7;



    # Prevent tests from accessing the Internet.