diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-25 18:04:27 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-07-25 19:06:07 +0200 |
commit | 174dd0eae73ad95b7bf8e364095f33e5163a448b (patch) | |
tree | 2e61ef25dec2c20d47d9ec57e0c7ae1c7b946c4a | |
parent | 9d5508d85c33b8fb22d79dde6176792eac2c2696 (diff) | |
download | nixlib-174dd0eae73ad95b7bf8e364095f33e5163a448b.tar nixlib-174dd0eae73ad95b7bf8e364095f33e5163a448b.tar.gz nixlib-174dd0eae73ad95b7bf8e364095f33e5163a448b.tar.bz2 nixlib-174dd0eae73ad95b7bf8e364095f33e5163a448b.tar.lz nixlib-174dd0eae73ad95b7bf8e364095f33e5163a448b.tar.xz nixlib-174dd0eae73ad95b7bf8e364095f33e5163a448b.tar.zst nixlib-174dd0eae73ad95b7bf8e364095f33e5163a448b.zip |
Fix description of boot.consoleLogLevel
-rw-r--r-- | nixos/modules/installer/cd-dvd/iso-image.nix | 4 | ||||
-rw-r--r-- | nixos/modules/system/boot/kernel.nix | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index c9abff2ecfc0..3712d3723d08 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -218,6 +218,8 @@ in system.boot.loader.kernelFile = "bzImage"; environment.systemPackages = [ pkgs.grub2 pkgs.grub2_efi pkgs.syslinux ]; + boot.consoleLogLevel = 7; + # In stage 1 of the boot, mount the CD as the root FS by label so # that we don't need to know its device. We pass the label of the # root filesystem on the kernel command line, rather than in @@ -229,6 +231,8 @@ in boot.kernelParams = [ "root=LABEL=${config.isoImage.volumeID}" "boot.shell_on_fail" + "nomodeset" + "systemd.log_level=debug" ]; fileSystems."/" = diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 63a095be6311..ae868219aa42 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -49,9 +49,8 @@ in type = types.int; default = 4; description = '' - The kernel console log level. Only log messages with a - priority numerically less than this will appear on the - console. + The kernel console log level. Log messages with a priority + numerically less than this will not appear on the console. ''; }; |