proxmox-mirrors/qemu-server
1
0
Fork 0
mirror of https://git.proxmox.com/git/qemu-server synced 2025-04-28 04:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

vm-network-scripts: move scripts to /usr/libexec

Browse Source 
Moves the network scripts from /var/lib/qemu-server into
/usr/libexec/qemu-server.

/usr/libexec is described as binaries run by programs which are not
intended to be directly executed by the user on [FHS 4.7]. On the other
hand /var/lib corresponds to variable state information, which does not
fit the use case here, see [FHS 5.8].

For the sake of preventing race conditions during upgrade we ship both
versions until version 9. This is required as package files are first
unpacked, including the removal of files not shipped by the new
version anymore, and only then configured, which triggers the restart
of the services.

[FHS 4.7]: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch04s07.html
[FHS 5.8]: https://refspecs.linuxfoundation.org/FHS_3.0/fhs/ch05s08.html

Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
Link: https://lore.proxmox.com/20250218133206.318155-1-m.sandoval@proxmox.com
This commit is contained in:
Maximiliano Sandoval 2025-02-18 14:32:05 +01:00 committed by Thomas Lamprecht
parent 5f8a64ae59
commit 65b20410ff
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
PVE/QemuServer.pm
View File

@ -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";
}

6
vm-network-scripts/Makefile
View File

@ -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

2
vm-network-scripts/pve-bridge-hotplug
View File

@ -1,3 +1,3 @@
#!/bin/sh
exec /var/lib/qemu-server/pve-bridge --hotplug "$@"
exec /usr/libexec/qemu-server/pve-bridge --hotplug "$@"