From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pve-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
by lore.proxmox.com (Postfix) with ESMTPS id CB1ED1FF162
for <inbox@lore.proxmox.com>; Sat, 22 Mar 2025 16:30:44 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 9A2753C383;
Sat, 22 Mar 2025 16:30:31 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Sun, 23 Mar 2025 00:17:13 +0900
In-Reply-To: <20250322152004.1646886-1-jing@jing.rocks>
References: <20250322152004.1646886-1-jing@jing.rocks>
MIME-Version: 1.0
Message-ID: <mailman.86.1742657429.359.pve-devel@lists.proxmox.com>
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Post: <mailto:pve-devel@lists.proxmox.com>
From: Jing Luo via pve-devel <pve-devel@lists.proxmox.com>
Precedence: list
Cc: Jing Luo <jing@jing.rocks>
X-Mailman-Version: 2.1.29
X-BeenThere: pve-devel@lists.proxmox.com
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
Reply-To: Proxmox VE development discussion <pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
Subject: [pve-devel] [PATCH pve-cluster] tree-wide: change /var/run to /run
and /var/lock to /run/lock
Content-Type: multipart/mixed; boundary="===============0018681942567433289=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>
--===============0018681942567433289==
Content-Type: message/rfc822
Content-Disposition: inline
Return-Path: <jing@jing.rocks>
X-Original-To: pve-devel@lists.proxmox.com
Delivered-To: pve-devel@lists.proxmox.com
Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by lists.proxmox.com (Postfix) with ESMTPS id 82F66C9416
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:30:29 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 6A7E13C292
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:30:29 +0100 (CET)
Received: from mail-gw3.jing.rocks (mail-gw3.jing.rocks [219.117.250.209])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS
for <pve-devel@lists.proxmox.com>; Sat, 22 Mar 2025 16:30:28 +0100 (CET)
Received: from mail-gw3.jing.rocks (localhost [127.0.0.1])
by mail-gw3.jing.rocks (Proxmox) with ESMTP id 02D13165D7
for <pve-devel@lists.proxmox.com>; Sun, 23 Mar 2025 00:20:20 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jing.rocks; h=cc
:cc:content-transfer-encoding:date:from:from:in-reply-to
:message-id:mime-version:references:reply-to:subject:subject:to
:to; s=mail-gw; bh=0Ej5rzRMimvaIVcWd2PQJ3IVp5sNeJO6x/nrkFDkEhc=; b=
Xsro39WU5KJWwKmztpz6HFTMU9AminUpTOjtNwsEWGPgoMm8vEIjCR6zktt+Q6iH
uaq1Kgu2/JhY1nsQE4qO5sCptP5etWQJ6pECOTZK8UqAUFywXnneZ5K+U0SgSJ//
ykVsfbBX+mcjny+X0lblURKoeRNacrmCqLdD3vmDWe84PKCHgrviz2T/oJi9O6nD
CSOPUX0RXnVsmGeHUbomkhZLB1Ka13FflQoC7Bw1TDuOmpfudkFSli26XjV0a0OE
QEcvyC0S1o3JUVPRX6NKOpETfNoBUC/ZuhZ/AFvo/Iydl6U1/Fxf9X/mKnaZJaVf
uc9X23Z1uMmEPb4T3A5OHQ==
Received: from mail.jing.rocks (mail.jing.rocks [IPv6:240b:10:f00:1b00::222])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by mail-gw3.jing.rocks (Proxmox) with ESMTPS id 067F7164E6
for <pve-devel@lists.proxmox.com>; Sun, 23 Mar 2025 00:20:19 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=jing.rocks;
s=default; t=1742656819;
bh=9/vMIzLz1xkLp7Eegl0A9owUJ+8Ga005elbhLgvrjmY=;
h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
b=Mu5F5aOGWhfw7RGDpv9DnR8sIDWqSJjTyeXfOmzYYH4Af2mlB3fksA7BinLjXkF+S
NJWiimPFkXrW3TGcDSaEiexHRpEyp1V9TWw6ItLyAI/v4UJEQatBoKBmaPVana9O3h
8xKQ01URdKnWNvAw2LxzFGvYZE3JqFiP6eIY8phMq+qZ9/HzKZQop80unrVjtL4dqx
CrbxfbTIw1cAEBaC3EdsTR1L6kHw2QPgNZKyCdCgpkPK5ceDcad1WsA7wk+KV/ggOp
4X1D6Un4oiR5Wm8tD4OUIA9AOZaokrnKyUE5yoPEYN6m064TBulL7wzglroNPZp1T8
HmUh5Tm+kw43w==
Received: from X570AM.jing.rocks (X570AM.lan [IPv6:240b:10:f00:1b00::7e82])
(Authenticated sender: jing@jing.rocks)
by mail.jing.rocks (Postfix) with ESMTPSA id EA4D7381AD;
Sun, 23 Mar 2025 00:20:18 +0900 (JST)
From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [PATCH pve-cluster] tree-wide: change /var/run to /run and /var/lock to /run/lock
Date: Sun, 23 Mar 2025 00:17:13 +0900
Message-ID: <20250322152004.1646886-6-jing@jing.rocks>
X-Mailer: git-send-email 2.49.0
In-Reply-To: <20250322152004.1646886-1-jing@jing.rocks>
References: <20250322152004.1646886-1-jing@jing.rocks>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.000 Adjusted score from AWL reputation of From: address
BAYES_00 -1.9 Bayes spam probability is 0 to 1%
DKIM_SIGNED 0.1 Message has a DKIM or DK signature, not necessarily valid
DKIM_VALID -0.1 Message has at least one valid DKIM or DK signature
DKIM_VALID_AU -0.1 Message has a valid DKIM or DK signature from author's domain
DKIM_VALID_EF -0.1 Message has a valid DKIM or DK signature from envelope-from domain
DMARC_PASS -0.1 DMARC pass policy
KAM_INFOUSMEBIZ 0.75 Prevalent use of .info|.us|.me|.me.uk|.biz|xyz|id|rocks|life domains in spam/malware
KAM_OTHER_BAD_TLD 0.75 Other untrustworthy TLDs
SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record
SPF_PASS -0.001 SPF: sender matches SPF record
"/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>
---
src/PVE/API2/ClusterConfig.pm | 4 ++--
src/PVE/CLI/pvecm.pm | 2 +-
src/PVE/RRD.pm | 4 ++--
src/pmxcfs/cfs-utils.h | 2 +-
src/pmxcfs/status.c | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/PVE/API2/ClusterConfig.pm b/src/PVE/API2/ClusterConfig.pm
index e7efe37..327e34d 100644
--- a/src/PVE/API2/ClusterConfig.pm
+++ b/src/PVE/API2/ClusterConfig.pm
@@ -20,7 +20,7 @@ use base qw(PVE::RESTHandler);
my $clusterconf = "/etc/pve/corosync.conf";
my $authfile = "/etc/corosync/authkey";
-my $local_cluster_lock = "/var/lock/pvecm.lock";
+my $local_cluster_lock = "/run/lock/pvecm.lock";
my $nodeid_desc = {
type => 'integer',
@@ -677,7 +677,7 @@ __PACKAGE__->register_method ({
my ($param) = @_;
my $result = {};
- my $socket_path = "/var/run/corosync-qdevice/corosync-qdevice.sock";
+ my $socket_path = "/run/corosync-qdevice/corosync-qdevice.sock";
return $result if !-S $socket_path;
my $qdevice_socket = IO::Socket::UNIX->new(
diff --git a/src/PVE/CLI/pvecm.pm b/src/PVE/CLI/pvecm.pm
index cc8b3d3..09e6a3f 100755
--- a/src/PVE/CLI/pvecm.pm
+++ b/src/PVE/CLI/pvecm.pm
@@ -377,7 +377,7 @@ __PACKAGE__->register_method ({
delete $param->{use_ssh};
$param->{password} = $password;
- my $local_cluster_lock = "/var/lock/pvecm.lock";
+ my $local_cluster_lock = "/run/lock/pvecm.lock";
PVE::Tools::lock_file($local_cluster_lock, 10, \&PVE::Cluster::Setup::join, $param);
if (my $err = $@) {
diff --git a/src/PVE/RRD.pm b/src/PVE/RRD.pm
index 5d4abc9..d98d219 100644
--- a/src/PVE/RRD.pm
+++ b/src/PVE/RRD.pm
@@ -33,7 +33,7 @@ sub create_rrd_data {
"-r" => $reso,
);
- my $socket = "/var/run/rrdcached.sock";
+ my $socket = "/run/rrdcached.sock";
push @args, "--daemon" => "unix:$socket" if -S $socket;
my ($start, $step, $names, $data) = RRDs::fetch($rrd, $cf, @args);
@@ -101,7 +101,7 @@ sub create_rrd_graph {
"--lower-limit" => 0,
);
- my $socket = "/var/run/rrdcached.sock";
+ my $socket = "/run/rrdcached.sock";
push @args, "--daemon" => "unix:$socket" if -S $socket;
my @coldef = ('#00ddff', '#ff0000');
diff --git a/src/pmxcfs/cfs-utils.h b/src/pmxcfs/cfs-utils.h
index eb86379..6cf5013 100644
--- a/src/pmxcfs/cfs-utils.h
+++ b/src/pmxcfs/cfs-utils.h
@@ -30,7 +30,7 @@
#include <fcntl.h>
#define HOST_CLUSTER_CONF_FN "/etc/corosync/corosync.conf"
-#define CFS_PID_FN "/var/run/pve-cluster.pid"
+#define CFS_PID_FN "/run/pve-cluster.pid"
#define VARLIBDIR "/var/lib/pve-cluster"
#define RUNDIR "/run/pve-cluster"
diff --git a/src/pmxcfs/status.c b/src/pmxcfs/status.c
index ff5fcc4..b9c202a 100644
--- a/src/pmxcfs/status.c
+++ b/src/pmxcfs/status.c
@@ -1244,7 +1244,7 @@ update_rrd_data(
g_return_if_fail(len > 0);
g_return_if_fail(len < 4096);
- static const char *rrdcsock = "unix:/var/run/rrdcached.sock";
+ static const char *rrdcsock = "unix:/run/rrdcached.sock";
int use_daemon = 1;
if (rrdc_connect(rrdcsock) != 0)
--
2.49.0
--===============0018681942567433289==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
--===============0018681942567433289==--