--- Begin Message ---
"/var/run" and "/var/lock" are deprecated.
This is to comply with Debian Policy 9.1.4 "/run and /run/lock".
(https://www.debian.org/doc/debian-policy/ch-opersys.html#run-and-run-lock)
Signed-off-by: Jing Luo <jing@jing.rocks>
---
PVE/CLI/qm.pm | 2 +-
PVE/QemuConfig.pm | 2 +-
PVE/QemuServer.pm | 14 +++++++-------
PVE/QemuServer/Helpers.pm | 2 +-
PVE/QemuServer/Memory.pm | 2 +-
qmeventd/qmeventd.service | 4 ++--
6 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/PVE/CLI/qm.pm b/PVE/CLI/qm.pm
index 4214a7ca..5e1321c6 100755
--- a/PVE/CLI/qm.pm
+++ b/PVE/CLI/qm.pm
@@ -703,7 +703,7 @@ __PACKAGE__->register_method ({
die "VM $vmid not running\n" if !PVE::QemuServer::check_running($vmid);
- my $socket = "/var/run/qemu-server/${vmid}.$iface";
+ my $socket = "/run/qemu-server/${vmid}.$iface";
my $cmd = "socat UNIX-CONNECT:$socket STDIO,raw,echo=0$escape";
diff --git a/PVE/QemuConfig.pm b/PVE/QemuConfig.pm
index ffdf9f03..b414db99 100644
--- a/PVE/QemuConfig.pm
+++ b/PVE/QemuConfig.pm
@@ -24,7 +24,7 @@ my $nodename = PVE::INotify::nodename();
mkdir "/etc/pve/nodes/$nodename";
mkdir "/etc/pve/nodes/$nodename/qemu-server";
-my $lock_dir = "/var/lock/qemu-server";
+my $lock_dir = "/run/lock/qemu-server";
mkdir $lock_dir;
sub assert_config_exists_on_node {
diff --git a/PVE/QemuServer.pm b/PVE/QemuServer.pm
index 5bb86f7a..268140ce 100644
--- a/PVE/QemuServer.pm
+++ b/PVE/QemuServer.pm
@@ -3204,8 +3204,8 @@ sub audio_devs {
sub get_tpm_paths {
my ($vmid) = @_;
return {
- socket => "/var/run/qemu-server/$vmid.swtpm",
- pid => "/var/run/qemu-server/$vmid.swtpm.pid",
+ socket => "/run/qemu-server/$vmid.swtpm",
+ pid => "/run/qemu-server/$vmid.swtpm.pid",
};
}
@@ -3461,7 +3461,7 @@ sub query_supported_cpu_flags {
$qemu_cmd,
'-machine', $default_machine,
'-display', 'none',
- '-chardev',
"socket,id=qmp,path=/var/run/qemu-server/$fakevmid.qmp,server=on,wait=off",
+ '-chardev',
"socket,id=qmp,path=/run/qemu-server/$fakevmid.qmp,server=on,wait=off",
'-mon', 'chardev=qmp,mode=control',
'-pidfile', $pidfile,
'-S', '-daemonize'
@@ -3710,7 +3710,7 @@ sub config_to_command {
push @$cmd, '-mon', "chardev=qmp,mode=control";
if (min_version($machine_version, 2, 12)) {
- push @$cmd, '-chardev',
"socket,id=qmp-event,path=/var/run/qmeventd.sock,reconnect=5";
+ push @$cmd, '-chardev',
"socket,id=qmp-event,path=/run/qmeventd.sock,reconnect=5";
push @$cmd, '-mon', "chardev=qmp-event,mode=control";
}
@@ -3812,7 +3812,7 @@ sub config_to_command {
for (my $i = 0; $i < $MAX_SERIAL_PORTS; $i++) {
my $path = $conf->{"serial$i"} or next;
if ($path eq 'socket') {
- my $socket = "/var/run/qemu-server/${vmid}.serial$i";
+ my $socket = "/run/qemu-server/${vmid}.serial$i";
push @$devices, '-chardev',
"socket,id=serial$i,path=$socket,server=on,wait=off";
# On aarch64, serial0 is the UART device. QEMU only allows
# connecting UART devices via the '-serial' command line, as
@@ -6330,7 +6330,7 @@ sub vm_stop_cleanup {
}
foreach my $ext (qw(mon qmp pid vnc qga)) {
- unlink "/var/run/qemu-server/${vmid}.$ext";
+ unlink "/run/qemu-server/${vmid}.$ext";
}
if ($conf->{ivshmem}) {
@@ -8789,7 +8789,7 @@ sub register_qmeventd_handle {
my ($vmid) = @_;
my $fh;
- my $peer = "/var/run/qmeventd.sock";
+ my $peer = "/run/qmeventd.sock";
my $count = 0;
for (;;) {
diff --git a/PVE/QemuServer/Helpers.pm b/PVE/QemuServer/Helpers.pm
index 72a46a0a..a27fcfdd 100644
--- a/PVE/QemuServer/Helpers.pm
+++ b/PVE/QemuServer/Helpers.pm
@@ -21,7 +21,7 @@ my $nodename = PVE::INotify::nodename();
# Paths and directories
-our $var_run_tmpdir = "/var/run/qemu-server";
+our $var_run_tmpdir = "/run/qemu-server";
mkdir $var_run_tmpdir;
sub qmp_socket {
diff --git a/PVE/QemuServer/Memory.pm b/PVE/QemuServer/Memory.pm
index e5024cd2..d87b3a06 100644
--- a/PVE/QemuServer/Memory.pm
+++ b/PVE/QemuServer/Memory.pm
@@ -726,7 +726,7 @@ sub hugepages_update_locked {
my $timeout = 60; #could be long if a lot of hugepages need to be allocated
- my $lock_filename = "/var/lock/hugepages.lck";
+ my $lock_filename = "/run/lock/hugepages.lck";
my $res = lock_file($lock_filename, $timeout, $code, @param);
die $@ if $@;
diff --git a/qmeventd/qmeventd.service b/qmeventd/qmeventd.service
index 1e2465be..d692d1a0 100644
--- a/qmeventd/qmeventd.service
+++ b/qmeventd/qmeventd.service
@@ -1,11 +1,11 @@
[Unit]
Description=PVE Qemu Event Daemon
-RequiresMountsFor=/var/run
+RequiresMountsFor=/run
Before=pve-ha-lrm.service
Before=pve-guests.service
[Service]
-ExecStart=/usr/sbin/qmeventd /var/run/qmeventd.sock
+ExecStart=/usr/sbin/qmeventd /run/qmeventd.sock
Type=forking
[Install]
--
2.49.0
--- End Message ---
