Branch: refs/heads/master
  Home:   https://github.com/NixOS/nixpkgs
  Commit: 6cfb3b636418526d1c49d14316a127133cf09c9d
      
https://github.com/NixOS/nixpkgs/commit/6cfb3b636418526d1c49d14316a127133cf09c9d
  Author: aszlig <[email protected]>
  Date:   2016-11-17 (Thu, 17 Nov 2016)

  Changed paths:
    M nixos/modules/testing/test-instrumentation.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M pkgs/applications/virtualization/qemu/default.nix
    A pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  nixos/tests: Use a patched QEMU for testing

The reason to patch QEMU is that with latest Nix, tests like "printing"
or "misc" fail because they expect the store paths to be owned by uid 0
and gid 0.

Starting with NixOS/nix@5e51ffb1c265e16486fcdd888ce4a04db9e5552b, Nix
builds inside of a new user namespace. Unfortunately this also means
that bind-mounted store paths that are part of the derivation's inputs
are no longer owned by uid 0 and gid 0 but by uid 65534 and gid 65534.

This in turn causes things like sudo or cups to fail with errors about
insecure file permissions.

So in order to avoid that, let's make sure the VM always gets files
owned by uid 0 and gid 0 and does a no-op when doing a chmod on a store
path.

In addition, this adds a virtualisation.qemu.program option so that we
can make sure that we only use the patched version if we're *really*
running NixOS VM tests (that is, whenever we have imported
test-instrumentation.nix).

Tested against the "misc" and "printing" tests.

Signed-off-by: aszlig <[email protected]>


  Commit: 705829b29ad5c4ac453015b8af265f0956517216
      
https://github.com/NixOS/nixpkgs/commit/705829b29ad5c4ac453015b8af265f0956517216
  Author: Eelco Dolstra <[email protected]>
  Date:   2016-12-15 (Thu, 15 Dec 2016)

  Changed paths:
    M nixos/modules/testing/test-instrumentation.nix
    M nixos/modules/virtualisation/qemu-vm.nix
    M pkgs/applications/virtualization/qemu/default.nix
    A pkgs/applications/virtualization/qemu/force-uid0-on-9p.patch
    M pkgs/top-level/all-packages.nix

  Log Message:
  -----------
  Merge pull request #20500 from aszlig/qemu-patched-for-nixos-tests

nixos/tests: Use a patched QEMU for testing


Compare: https://github.com/NixOS/nixpkgs/compare/067171a61f2e...705829b29ad5
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits

Reply via email to