diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm index a97e77b3..1efb097c 100644 --- a/PVE/QemuServer.pm +++ b/PVE/QemuServer.pm @@ -1654,8 +1654,8 @@ sub print_netdev_full { my $script = $hotplug ? "pve-bridge-hotplug" : "pve-bridge"; if ($net->{bridge}) { - $netdev = "type=tap,id=$netid,ifname=${ifname},script=/var/lib/qemu-server/$script" - .",downscript=/var/lib/qemu-server/pve-bridgedown$vhostparam"; + $netdev = "type=tap,id=$netid,ifname=${ifname},script=/usr/libexec/qemu-server/$script" + .",downscript=/usr/libexec/qemu-server/pve-bridgedown$vhostparam"; } else { $netdev = "type=user,id=$netid,hostname=$vmname"; } diff --git a/vm-network-scripts/Makefile b/vm-network-scripts/Makefile index 5ba537d0..61733e2d 100644 --- a/vm-network-scripts/Makefile +++ b/vm-network-scripts/Makefile @@ -1,8 +1,14 @@ DESTDIR= +LIBEXECDIR=$(DESTDIR)/usr/libexec/qemu-server +# Remove with version 9 VARLIBDIR=$(DESTDIR)/var/lib/qemu-server .PHONY: install install: pve-bridge pve-bridge-hotplug pve-bridgedown + install -d ${LIBEXECDIR} + install -m 0755 pve-bridge ${LIBEXECDIR}/pve-bridge + install -m 0755 pve-bridge-hotplug ${LIBEXECDIR}/pve-bridge-hotplug + install -m 0755 pve-bridgedown ${LIBEXECDIR}/pve-bridgedown install -d ${VARLIBDIR} install -m 0755 pve-bridge ${VARLIBDIR}/pve-bridge install -m 0755 pve-bridge-hotplug ${VARLIBDIR}/pve-bridge-hotplug diff --git a/vm-network-scripts/pve-bridge-hotplug b/vm-network-scripts/pve-bridge-hotplug index f36ed408..3ae01ea5 100755 --- a/vm-network-scripts/pve-bridge-hotplug +++ b/vm-network-scripts/pve-bridge-hotplug @@ -1,3 +1,3 @@ #!/bin/sh -exec /var/lib/qemu-server/pve-bridge --hotplug "$@" +exec /usr/libexec/qemu-server/pve-bridge --hotplug "$@"