forked from mirrors/nixpkgs
Merge pull request #207801 from ElvishJerricco/systemd-stage-1-test-instrumentation
systemd-stage-1: Improve test-instrumentation output
This commit is contained in:
commit
18be00a2d9
nixos/modules
|
@ -148,6 +148,16 @@ in {
|
||||||
visible = false;
|
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 {
|
contents = mkOption {
|
||||||
description = lib.mdDoc "Set of files that have to be linked into the initrd";
|
description = lib.mdDoc "Set of files that have to be linked into the initrd";
|
||||||
example = literalExpression ''
|
example = literalExpression ''
|
||||||
|
@ -352,6 +362,7 @@ in {
|
||||||
"/etc/systemd/system.conf".text = ''
|
"/etc/systemd/system.conf".text = ''
|
||||||
[Manager]
|
[Manager]
|
||||||
DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"}
|
DefaultEnvironment=PATH=/bin:/sbin ${optionalString (isBool cfg.emergencyAccess && cfg.emergencyAccess) "SYSTEMD_SULOGIN_FORCE=1"}
|
||||||
|
${cfg.extraConfig}
|
||||||
'';
|
'';
|
||||||
|
|
||||||
"/lib/modules".source = "${modulesClosure}/lib/modules";
|
"/lib/modules".source = "${modulesClosure}/lib/modules";
|
||||||
|
|
|
@ -96,6 +96,12 @@ in
|
||||||
MaxLevelConsole=debug
|
MaxLevelConsole=debug
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
boot.initrd.systemd.contents."/etc/systemd/journald.conf".text = ''
|
||||||
|
[Journal]
|
||||||
|
ForwardToConsole=yes
|
||||||
|
MaxLevelConsole=debug
|
||||||
|
'';
|
||||||
|
|
||||||
systemd.extraConfig = ''
|
systemd.extraConfig = ''
|
||||||
# Don't clobber the console with duplicate systemd messages.
|
# Don't clobber the console with duplicate systemd messages.
|
||||||
ShowStatus=no
|
ShowStatus=no
|
||||||
|
@ -107,6 +113,8 @@ in
|
||||||
DefaultTimeoutStartSec=300
|
DefaultTimeoutStartSec=300
|
||||||
'';
|
'';
|
||||||
|
|
||||||
|
boot.initrd.systemd.extraConfig = config.systemd.extraConfig;
|
||||||
|
|
||||||
boot.consoleLogLevel = 7;
|
boot.consoleLogLevel = 7;
|
||||||
|
|
||||||
# Prevent tests from accessing the Internet.
|
# Prevent tests from accessing the Internet.
|
||||||
|
|
Loading…
Reference in a new issue