Commit d4468bed authored by Florian Klink's avatar Florian Klink Committed by Tuomas Tynkkynen
Browse files

modules/virtualisation/qemu-vm: always enable serial console 

Always enable both tty and serial console, but set preferred console
depending on cfg.graphical.
Even in qemu graphical mode, you can switch to the serial console via
Ctrl+Alt+3.

With that being done, you also don't need to specify
`systemd.services."serial-getty@ttyS0".enable = true;` either as described in
https://nixos.wiki/wiki/Cheatsheet#Building_a_service_as_a_VM_.28for_testing.29,
as systemd automatically spawns a getty on consoles passwd via cmdline.

This also means, vms built by 'nixos-rebuild build-vm' can simply be run
properly in nographic mode by appending `-nographic` to `result/bin/run-*-vm`,
without the need to explicitly add platform-specific QEMU_KERNEL_PARAMS.
parent 70c57fe3

nixos/modules/virtualisation/qemu-vm.nix

+10 −5
Original line number Diff line number Diff line
@@ -24,7 +24,11 @@ let 
  cfg = config.virtualisation;



  qemuGraphics = lib.optionalString (!cfg.graphics) "-nographic";

  kernelConsole = if cfg.graphics then "" else "console=${qemuSerialDevice}";



  # enable both serial console and tty0. select preferred console (last one) based on cfg.graphics

  kernelConsoles = let

    consoles = [ "console=${qemuSerialDevice}" "console=tty0" ];

    in lib.concatStringsSep " " (if cfg.graphics then consoles else reverseList consoles);



  # XXX: This is very ugly and in the future we really should use attribute

  # sets to build ALL of the QEMU flags instead of this mixed mess of Nix
@@ -107,7 +111,7 @@ let 
            ${mkDiskIfaceDriveFlag "0" "file=$NIX_DISK_IMAGE,cache=writeback,werror=report"} \

            -kernel ${config.system.build.toplevel}/kernel \

            -initrd ${config.system.build.toplevel}/initrd \

            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsole} $QEMU_KERNEL_PARAMS" \

            -append "$(cat ${config.system.build.toplevel}/kernel-params) init=${config.system.build.toplevel}/init regInfo=${regInfo}/registration ${kernelConsoles} $QEMU_KERNEL_PARAMS" \

          ''} \

          $extraDisks \

          ${qemuGraphics} \
@@ -247,8 +251,9 @@ in 
        default = true;

        description =

          ''

            Whether to run QEMU with a graphics window, or access

            the guest computer serial port through the host tty.

            Whether to run QEMU with a graphics window, or in nographic mode.

            Serial console will be enabled on both settings, but this will

            change the preferred console.

            '';

      };