From b9f2e936dece429498dd4bdc04f61cd67f2dd009 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Wed, 21 Jan 2026 11:33:47 +0100
Subject: [PATCH] Use correct serial console ttyS1 in fox

---
 m/common/base/boot.nix      |  7 -------
 m/common/xeon/console.nix   |  7 +++++++
 m/fox/configuration.nix     |  2 +-
 m/fox/serial-console.nix    | 21 +++++++++++++++++++++
 m/raccoon/configuration.nix |  1 +
 5 files changed, 30 insertions(+), 8 deletions(-)
 create mode 100644 m/fox/serial-console.nix

diff --git a/m/common/base/boot.nix b/m/common/base/boot.nix
index cfa44564..e1fb2709 100644
--- a/m/common/base/boot.nix
+++ b/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";
 
diff --git a/m/common/xeon/console.nix b/m/common/xeon/console.nix
index e4c3644c..6e6ef5a9 100644
--- a/m/common/xeon/console.nix
+++ b/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
+  '';
 }
diff --git a/m/fox/configuration.nix b/m/fox/configuration.nix
index 3d00426d..f003e719 100644
--- a/m/fox/configuration.nix
+++ b/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.
diff --git a/m/fox/serial-console.nix b/m/fox/serial-console.nix
new file mode 100644
index 00000000..ad7d9313
--- /dev/null
+++ b/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
+  '';
+}
diff --git a/m/raccoon/configuration.nix b/m/raccoon/configuration.nix
index 38ce7198..83010822 100644
--- a/m/raccoon/configuration.nix
+++ b/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