Fixes this failure: https://hydra.nixos.org/build/152776341
Unsure how this happened, but I verified the GPG signatures locally to
make sure the new hash is good.
Per a comment on the PR that made this change, it turns out to cause
issues in some cases: https://github.com/NixOS/nixpkgs/pull/109332#issuecomment-762005163
For now, let's revert back. Presumably the issues derive from the system
iptables not matching libvirt's iptables.
In the future, #81172 should move us back into the future, and I'm
perfectly fine waiting for that PR to handle this separately.
It was supposed to be '/var' rather than '/var/lib'. This fixes an issue
where some tools don't connect to the right socket (because they were
connecting to '$localstatedir/run/libvirt...' instead of
'$runstatedir/libvirt...').
Also change runstatedir to just be '/run' since it avoids a log line
complaining about that.
The previous commit updates to a newer libvirt with a newer build setup.
This commit carries forward that work into a mergeable state.
Based on the suggestion in
https://github.com/NixOS/nixpkgs/pull/103309#issuecomment-724958608, I
did a fwupd-like patch for the various meson.build files.
systemd complains:
Jul 08 12:43:59 kaiser systemd[1]: /nix/store/bvfikb8v9m646m23fqm0rfnnsj6plc2k-libvirt-6.2.0/lib/systemd/system/libvirtd-admin.socket:11: ListenStream= references a path below legacy directory /var/run/, updating /var/run/libvirt/libvirt-admin-sock → /run/libvirt/libvirt-admin-sock; please update the unit file accordingly.
Jul 08 12:43:59 kaiser systemd[1]: /nix/store/bvfikb8v9m646m23fqm0rfnnsj6plc2k-libvirt-6.2.0/lib/systemd/system/libvirtd-ro.socket:11: ListenStream= references a path below legacy directory /var/run/, updating /var/run/libvirt/libvirt-sock-ro → /run/libvirt/libvirt-sock-ro; please update the unit file accordingly.
Jul 08 12:43:59 kaiser systemd[1]: /nix/store/bvfikb8v9m646m23fqm0rfnnsj6plc2k-libvirt-6.2.0/lib/systemd/system/libvirtd.socket:9: ListenStream= references a path below legacy directory /var/run/, updating /var/run/libvirt/libvirt-sock → /run/libvirt/libvirt-sock; please update the unit file accordingly.
Let's just set it correctly manually, that is what Red Hat does:
ba7592f6c1
See also:
390997925a
With the bump of iptables (#75026) ebtables was renamed from `ebtables`
to `ebtables-legacy`. libvirtd requires this binary to be availabe to
configure the host networking.
fixes#75878