BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
systemd-stage-1: Improve test-instrumentation output
This commit is contained in:
Janne Heß 2022-12-28 01:43:03 +01:00 committed by GitHub
commit 18be00a2d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
nixos/modules/system/boot/systemd/initrd.nix
View file

@ -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";

8
nixos/modules/testing/test-instrumentation.nix
View file

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