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
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 5dee9b5699d1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: dce7cc111ae6
Choose a head ref
  • 4 commits
  • 1 file changed
  • 2 contributors

Commits on Oct 30, 2020

  1. nixos/qemu-vm: Fix condition in requiredKernelConfig 

    'optional' just takes a single item rather than a list
    @atlaua
    atlaua committed Oct 30, 2020
    Copy the full SHA
    ef5268b View commit details

  2. nixos/qemu-vm: Don't require CONFIG_EXPERIMENTAL 

    The kernel stopped using this config option with version 3.9 (back in
2013!).
    @atlaua
    atlaua committed Oct 30, 2020
    Copy the full SHA
    8ee9704 View commit details

  3. nixos/qemu-vm: Update system.requiredKernelConfig 

    Verify that all kernel modules which are required for mounting
/nix/store in the VM are present.
    @atlaua
    atlaua committed Oct 30, 2020
    Copy the full SHA
    a7de454 View commit details

Commits on Nov 11, 2020

  1. Merge pull request #96912 from atlaua/aranea/qemu-vm-kernel-config 

    nixos/qemu-vm: Fix and update system.requiredKernelConfig entries
    @kevincox
    kevincox authored Nov 11, 2020
    Copy the full SHA
    dce7cc1 View commit details
Showing with 5 additions and 2 deletions.
  1. +5 −2 nixos/modules/virtualisation/qemu-vm.nix
7 changes: 5 additions & 2 deletions nixos/modules/virtualisation/qemu-vm.nix
View file
Original file line number Diff line number Diff line change
@@ -744,16 +744,19 @@ in
(isEnabled "VIRTIO_PCI")
(isEnabled "VIRTIO_NET")
(isEnabled "EXT4_FS")
(isEnabled "NET_9P_VIRTIO")
(isEnabled "9P_FS")
(isYes "BLK_DEV")
(isYes "PCI")
(isYes "EXPERIMENTAL")
(isYes "NETDEVICES")
(isYes "NET_CORE")
(isYes "INET")
(isYes "NETWORK_FILESYSTEMS")
] ++ optional (!cfg.graphics) [
] ++ optionals (!cfg.graphics) [
(isYes "SERIAL_8250_CONSOLE")
(isYes "SERIAL_8250")
] ++ optionals (cfg.writableStore) [
(isEnabled "OVERLAY_FS")
];

};