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