m/common/base/boot.nix

@@ -4,13 +4,6 @@
   # Use the GRUB 2 boot loader.
   boot.loader.grub.enable = true;
 
-  # Enable GRUB2 serial console
-  boot.loader.grub.extraConfig = ''
-    serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
-    terminal_input --append serial
-    terminal_output --append serial
-  '';
-
   boot.kernel.sysctl = {
     "kernel.perf_event_paranoid" = lib.mkDefault "-1";
 

m/common/xeon/console.nix

@@ -11,4 +11,11 @@
     "console=tty1"
     "console=ttyS0,115200"
   ];
+
+  # Enable GRUB2 serial console
+  boot.loader.grub.extraConfig = ''
+    serial --unit=0 --speed=115200 --word=8 --parity=no --stop=1
+    terminal_input --append serial
+    terminal_output --append serial
+  '';
 }

m/fox/configuration.nix

@@ -3,13 +3,13 @@
 {
   imports = [
     ../common/base.nix
-    ../common/xeon/console.nix
     ../module/amd-uprof.nix
     ../module/emulation.nix
     ../module/nvidia.nix
     ../module/slurm-client.nix
     ../module/hut-substituter.nix
     ./wireguard.nix
+    ./serial-console.nix
   ];
 
   # Don't turn off on August as UPC has different dates.

m/fox/serial-console.nix

@@ -0,0 +1,21 @@
+{
+  # Restart the serial console
+  systemd.services."serial-getty@ttyS1" = {
+    enable = true;
+    wantedBy = [ "getty.target" ];
+    serviceConfig.Restart = "always";
+  };
+
+  # Enable serial console
+  boot.kernelParams = [
+    "console=tty1"
+    "console=ttyS1,115200"
+  ];
+
+  # Enable GRUB2 serial console
+  boot.loader.grub.extraConfig = ''
+    serial --unit=1 --speed=115200 --word=8 --parity=no --stop=1
+    terminal_input --append serial
+    terminal_output --append serial
+  '';
+}

m/raccoon/configuration.nix

@@ -4,6 +4,7 @@
   imports = [
     ../common/base.nix
     ../common/ssf/hosts.nix
+    ../common/xeon/console.nix
     ../module/emulation.nix
     ../module/debuginfod.nix
     ../module/nvidia.nix