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: f12ad780bf44
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: d4d9d9c552a7
Choose a head ref
  • 3 commits
  • 2 files changed
  • 1 contributor

Commits on Jul 4, 2020

  1. qemu-vm.nix: Do not mount /boot read-only. 

    There does not seem to be a good reason to do this, and it breaks running
`nixos-rebuild boot --install-bootloader` inside the VM.
    @nh2
    nh2 committed Jul 4, 2020
    Copy the full SHA
    2fa351b View commit details
    Browse the repository at this point in the history

  2. qemu-vm.nix: Fix device name hardcodes on useBootLoader. 

    boot.loader.grub.device` was hardcoded to `bootDevice`, which is
wrong, because that's the device for `/`, and with `useBootLoader`
the boot loader is not on that device.

This bug probably came into existence because of bad naming;
`virtualisation.bootDevice` has description
"The disk to be used for the root filesystem", which is very confusing;
it should be `.rootDevice` then!
Unfortunately, the description is right and the attribute name is wrong,
so it is not easy to change this without deprecation.

This commit ensures that even if you use `useBootLoader` and
`diskInterface == "scsi"`, the created VM can boot through, and can run
`nixos-rebuild afterwards.

It also adds extra commentary to explain what's going on in this module
in general in relation to `useBootLoader`.
    @nh2
    nh2 committed Jul 4, 2020
    Copy the full SHA
    5b16d4c View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2020

  1. Merge pull request #92122 from nh2/qemu-vm-fix-useBootLoader 

    qemu-vm: Fix useBootLoader, remove `/boot` read-only restriction
    @nh2
    nh2 committed Jul 6, 2020
    Copy the full SHA
    d4d9d9c View commit details
    Browse the repository at this point in the history