From 4bd164807436bfefe28a7ea8451fb4064364da89 Mon Sep 17 00:00:00 2001
From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
Date: Mon, 22 Jul 2024 13:34:19 +0200
Subject: [PATCH] Set the serial console to ttyS1 in raccoon
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Apparently the ttyS0 console doesn't exist but ttyS1 does:

  raccoon% sudo stty -F /dev/ttyS0
  stty: /dev/ttyS0: Input/output error
  raccoon% sudo stty -F /dev/ttyS1
  speed 9600 baud; line = 0;
  -brkint -imaxbel

The dmesg line agrees:

  00:03: ttyS1 at I/O 0x2f8 (irq = 3, base_baud = 115200) is a 16550A

The console configuration is then moved from base to xeon to allow
changing it for the raccoon machine.

Reviewed-by: Aleix Boné <abonerib@bsc.es>
---
 m/common/base/boot.nix                   | 6 ------
 m/common/xeon.nix                        | 2 +-
 m/common/xeon/{getty.nix => console.nix} | 6 ++++++
 m/raccoon/configuration.nix              | 6 ++++++
 4 files changed, 13 insertions(+), 7 deletions(-)
 rename m/common/xeon/{getty.nix => console.nix} (63%)

diff --git a/m/common/base/boot.nix b/m/common/base/boot.nix
index 0fb0855..cfa4456 100644
--- a/m/common/base/boot.nix
+++ b/m/common/base/boot.nix
@@ -11,12 +11,6 @@
     terminal_output --append serial
   '';
 
-  # Enable serial console
-  boot.kernelParams = [
-    "console=tty1"
-    "console=ttyS0,115200"
-  ];
-
   boot.kernel.sysctl = {
     "kernel.perf_event_paranoid" = lib.mkDefault "-1";
 
diff --git a/m/common/xeon.nix b/m/common/xeon.nix
index 25d4121..30cf73c 100644
--- a/m/common/xeon.nix
+++ b/m/common/xeon.nix
@@ -3,7 +3,7 @@
   imports = [
     ./base.nix
     ./xeon/fs.nix
-    ./xeon/getty.nix
+    ./xeon/console.nix
     ./xeon/net.nix
   ];
 }
diff --git a/m/common/xeon/getty.nix b/m/common/xeon/console.nix
similarity index 63%
rename from m/common/xeon/getty.nix
rename to m/common/xeon/console.nix
index 40c5701..e4c3644 100644
--- a/m/common/xeon/getty.nix
+++ b/m/common/xeon/console.nix
@@ -5,4 +5,10 @@
     wantedBy = [ "getty.target" ];
     serviceConfig.Restart = "always";
   };
+
+  # Enable serial console
+  boot.kernelParams = [
+    "console=tty1"
+    "console=ttyS0,115200"
+  ];
 }
diff --git a/m/raccoon/configuration.nix b/m/raccoon/configuration.nix
index 2a1bc68..be9b10c 100644
--- a/m/raccoon/configuration.nix
+++ b/m/raccoon/configuration.nix
@@ -8,6 +8,12 @@
   # Don't install Grub on the disk yet
   boot.loader.grub.device = "nodev";
 
+  # Enable serial console
+  boot.kernelParams = [
+    "console=tty1"
+    "console=ttyS1,115200"
+  ];
+
   networking = {
     hostName = "raccoon";
     # Only BSC DNSs seem to be reachable from the office VLAN