Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 04002e2b7186
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: 7499e4a5b917
Choose a head ref
  • 5 commits
  • 2 files changed
  • 1 contributor

Commits on May 7, 2018

  1. virtualisation/qemu-vm.nix: use lib.optionalString

    @flokli @dezgeg
    flokli authored and dezgeg committed May 7, 2018
    Copy the full SHA
    046e374 View commit details
    Browse the repository at this point in the history

  2. virtualisation/qemu-vm.nix: remove ttys 

    unused.
    @flokli @dezgeg
    flokli authored and dezgeg committed May 7, 2018
    Copy the full SHA
    36f4b7f View commit details
    Browse the repository at this point in the history

  3. qemu: fix spaces in postInstall

    @flokli @dezgeg
    flokli authored and dezgeg committed May 7, 2018
    Copy the full SHA
    70c57fe View commit details
    Browse the repository at this point in the history

  4. 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.
    @flokli @dezgeg
    flokli authored and dezgeg committed May 7, 2018
    Copy the full SHA
    d4468be View commit details
    Browse the repository at this point in the history

  5. modules/virtualisation/qemu-vm: set console baudrate to 115200

    @flokli @dezgeg
    flokli authored and dezgeg committed May 7, 2018
    Copy the full SHA
    7499e4a View commit details
    Browse the repository at this point in the history