diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-23 14:46:54 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-23 14:46:54 +0100 |
commit | 7a382679e42db39907d866294396e5dfd1f7b2ea (patch) | |
tree | 14ebae303e2420350abae06d1aa65609b6451ea3 /modules/virtualisation | |
parent | ef5108f5603f64f71e1996f146a1334807b834b5 (diff) | |
download | nixlib-7a382679e42db39907d866294396e5dfd1f7b2ea.tar nixlib-7a382679e42db39907d866294396e5dfd1f7b2ea.tar.gz nixlib-7a382679e42db39907d866294396e5dfd1f7b2ea.tar.bz2 nixlib-7a382679e42db39907d866294396e5dfd1f7b2ea.tar.lz nixlib-7a382679e42db39907d866294396e5dfd1f7b2ea.tar.xz nixlib-7a382679e42db39907d866294396e5dfd1f7b2ea.tar.zst nixlib-7a382679e42db39907d866294396e5dfd1f7b2ea.zip |
Revert 434260c772622408b1503a4ff2b65bfd900f3c80
There is a bug in unionfs, but it only manifested itself because of our accidental use of stage-1 libraries in stage-2.
Diffstat (limited to 'modules/virtualisation')
-rw-r--r-- | modules/virtualisation/qemu-vm.nix | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/modules/virtualisation/qemu-vm.nix b/modules/virtualisation/qemu-vm.nix index cf7738768e1f..e125654e80f2 100644 --- a/modules/virtualisation/qemu-vm.nix +++ b/modules/virtualisation/qemu-vm.nix @@ -311,13 +311,7 @@ in fi ''; - virtualisation.pathsInNixDB = - [ config.system.build.toplevel - # This path from the initrd must be registered as valid because - # unionfs uses it from the target Nix store (?). FIXME: get - # unionfs to use the path from the Nix store instead. - config.system.build.extraUtils - ]; + virtualisation.pathsInNixDB = [ config.system.build.toplevel ]; virtualisation.qemu.options = [ "-vga std" "-usbdevice tablet" ]; |