Make stage-1/2 logging unconditional, and drop log level to "debug"

Using "debug" level prevents spamming the console with messages twice
(once directly and once via kmsg).

1 files changed, 2 insertions, 10 deletions

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 45652b355c8..f31620df1d8 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -200,8 +200,8 @@ let
 
     inherit (config.boot) resumeDevice devSize runSize;
 
-    inherit (config.boot.initrd) checkJournalingFS 
-      logCommands preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;
+    inherit (config.boot.initrd) checkJournalingFS
+      preLVMCommands preDeviceCommands postDeviceCommands postMountCommands kernelModules;
 
     resumeDevices = map (sd: if sd ? device then sd.device else "/dev/disk/by-label/${sd.label}")
                     (filter (sd: (sd ? label || hasPrefix "/dev/" sd.device) && !sd.randomEncryption) config.swapDevices);
@@ -269,14 +269,6 @@ in
       '';
     };
 
-    boot.initrd.logCommands = mkOption {
-      default = false;
-      type = types.bool;
-      description = ''
-        Whether to replicate command output of stage-1 booting to <filename>/dev/kmsg</filename> or <filename>/run/log/stage-1-init.log</filename> if <filename>/dev/kmsg</filename> is not writable.
-      '';
-    };
-
     boot.initrd.prepend = mkOption {
       default = [ ];
       type = types.listOf types.str;