diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2013-12-10 13:00:02 +0100 |
| commit | 089da3ee5c25f5d36d660d6c679cb0c963617fa7 (patch) | |
| tree | c21e0b5ec1b1daa2cb08d2a9fdb460aa13d10c7f /nixos | |
| parent | db32c7ca8bf7daad6792c3e9597c68768aafd271 (diff) | |
| parent | 393dcd9c84e104ab7ff7e35f5612dc221e58d29b (diff) | |
| download | nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.gz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.bz2 nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.lz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.xz nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.tar.zst nixlib-089da3ee5c25f5d36d660d6c679cb0c963617fa7.zip | |
Merge master into x-updates
Conflicts (simple): pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/modules/virtualisation/libvirtd.nix | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index d8668eb16072..583b09192e33 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -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 |