From 0bfd27535f7f646dcb99963ad05bd93eb0c55b03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 15 Sep 2014 23:03:20 +0200 Subject: [PATCH] nixos/libvirtd: refresh LXC emulator path on startup This fixes the issue when the LXC emulator binary is garbage collected and breaks libvirtd containers, because libvirtd XML file still refers to GC'ed store path. We already have a fix for QEMU, this commit extends the fix to cover LXC too. --- nixos/modules/virtualisation/libvirtd.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index 318460f4c2cf..2d03f0544b67 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -129,12 +129,12 @@ in # config file. But this path can unfortunately be garbage collected # 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 + for file in /etc/libvirt/qemu/*.xml /etc/libvirt/lxc/*.xml; do test -f "$file" || continue # get (old) emulator path from config file emulator=$(grep "^[[:space:]]*" "$file" | sed 's,^[[:space:]]*\(.*\).*,\1,') # get a (definitely) working emulator path by re-scanning $PATH - new_emulator=$(command -v $(basename "$emulator")) + new_emulator=$(PATH=${pkgs.libvirt}/libexec:$PATH command -v $(basename "$emulator")) # write back sed -i "s,^[[:space:]]*.*, $new_emulator ," "$file" done