From c682fc0422385914fee7db9981b34cc0a7fece0a Mon Sep 17 00:00:00 2001
From: Luke Granger-Brown <hg@lukegb.com>
Date: Sun, 14 Mar 2021 17:39:07 +0000
Subject: [PATCH] blade: fix serial console

---
 ops/nixos/lib/blade.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/ops/nixos/lib/blade.nix b/ops/nixos/lib/blade.nix
index 4c23ce687c..542f255296 100644
--- a/ops/nixos/lib/blade.nix
+++ b/ops/nixos/lib/blade.nix
@@ -29,7 +29,19 @@ in {
   config = {
     boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "uhci_hcd" "be2iscsi" "usb_storage" "usbhid" "sd_mod" "sr_mod" ];
     boot.kernelModules = [ "kvm-amd" "acpi_power_meter" "acpi_ipmi" "ipmi_si" ];
-    boot.kernelParams = [ "mitigations=off" ];
+
+    # Enable serial console.
+    boot.loader.grub.extraConfig = ''
+      serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
+      terminal_input console serial
+      terminal_output console serial
+    '';
+    boot.kernelParams = [
+      "console=tty1"
+      "console=ttyS0,115200"  # <-- /dev/console
+
+      "mitigations=off"
+    ];
   
     fileSystems = let
       zfs = device: {
@@ -158,17 +170,6 @@ in {
       Storage=none
       ProcessSizeMax=0
     '';
-
-    # Enable serial console.
-    loader.grub.extraConfig = ''
-      serial --speed=115200 --unit=0 --word=8 --parity=no --stop=1
-      terminal_input console serial
-      terminal_output console serial
-    '';
-    boot.kernelParams = [
-      "console=tty1"
-      "console=ttyS0,115200"  # <-- /dev/console
-    ];
   
     system.stateVersion = "21.05";
   };