movefasta/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-07-13 21:50:33 +03:00
Code Activity

Merge master into x-updates

Browse source 
Conflicts (simple):
	pkgs/top-level/all-packages.nix
This commit is contained in:
Vladimír Čunát 2013-12-10 13:00:02 +01:00
commit 089da3ee5c
64 changed files with 558 additions and 95 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/modules/virtualisation/libvirtd.nix
View file

@ -107,6 +107,7 @@ in
# while still being used by the virtual machine. So update the
# emulator path on each startup to something valid (re-scan $PATH).
for file in /etc/libvirt/qemu/*.xml; do
test -f "$file" || continue
# get (old) emulator path from config file
emulator=$(grep "^[[:space:]]*<emulator>" "$file" | sed 's,^[[:space:]]*<emulator>\(.*\)</emulator>.*,\1,')
# get a (definitely) working emulator path by re-scanning $PATH