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 [IPv6:2a01:7e0:0:424::9])
	by lore.proxmox.com (Postfix) with ESMTPS id 617B81FF162
	for <inbox@lore.proxmox.com>; Sat, 22 Mar 2025 16:30:36 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 2232F3C2BB;
	Sat, 22 Mar 2025 16:30:31 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Sun, 23 Mar 2025 00:17:14 +0900
In-Reply-To: <20250322152004.1646886-1-jing@jing.rocks>
References: <20250322152004.1646886-1-jing@jing.rocks>
MIME-Version: 1.0
Message-ID: <mailman.85.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-common] tree-wide: change /var/run to /run
 and /var/lock to /run/lock
Content-Type: multipart/mixed; boundary="===============0835599186114756477=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>

--===============0835599186114756477==
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 7DA6AC9415
	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 66E0C3C1FB
	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 A372B16514
	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=BMv14TXBSAG/MeGBepJw4nrrJfCkalhO4nrJNTN2ck4=; b=
	jh5YS1PDmYrHgBWVfquubIOgIfjDj3OQzgjoZMKoMDwxz+AyQ+osVY/vVowTHua6
	GWxsTpoQo20ybQxcvLw1X/5sa9dA+opEnYKuBgY8CXDIJI5gXHLQi3/LVHaXlbH+
	dj/rlDfirqiOfA6IGTkWP3JBn9eyjJ5oqz4gg5pA7quSlvsZ1V28qMxEH2zXVBYH
	01kKBeLrH+3hz9A4AiqIAS7ZVcugRQguQAiLySJO5Wy/ds8RjobxkdYg2uv+tPtn
	2i9i4LvhGThojUE89HLxSgppbi9ELw8JfIBw0oVipm8SUS1xIg+iPQQgKCTIyw7D
	1LY8eaMR9JE/M67dFtQU1g==
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 A3933164E7
	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=CTQO+hzMg6cylwS/nQsZT6vrBCgCEhlw3Kx/kSEu4so=;
	h=From:To:Cc:Subject:Date:In-Reply-To:References:From;
	b=carVCrvqzVYCbGXuPOtvcTqLqFbZJYA2pj6vY8G81muIjkZ0ZXFfOewwdz02CyTP9
	 CFwDkvmC3Mgi91q/Y5+S+hXIS7p0tU4U6V49bS9CJhNhK1qziNJLrxkZYK06Ep46F6
	 HKMNlqct/o1cwlOBYuGDaup8aU2QHzNIHIZ3y1nqQIzdVIXtZmo0hs+C3WpoT+/9vj
	 1GhlBOC08H/lOK4YGbTBS38gEYPtt8bauOU2Dcwd3sLsjAP0kgVSKHlXiRQANSln1j
	 Q3Ulvs1D2cYA85BFxGdPU3Z8j/Rl6RJn3DMCyc+BsUZXX79velviiGU5WQULRHBEQ3
	 qaWK5W+AqJYCA==
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 9EAC138201;
	Sun, 23 Mar 2025 00:20:19 +0900 (JST)
From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [PATCH pve-common] tree-wide: change /var/run to /run and /var/lock to /run/lock
Date: Sun, 23 Mar 2025 00:17:14 +0900
Message-ID: <20250322152004.1646886-7-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/Daemon.pm  | 4 ++--
 src/PVE/Network.pm | 2 +-
 src/PVE/Tools.pm   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/PVE/Daemon.pm b/src/PVE/Daemon.pm
index 63fd5ee..e2dc0a7 100644
--- a/src/PVE/Daemon.pm
+++ b/src/PVE/Daemon.pm
@@ -3,7 +3,7 @@ package PVE::Daemon;
 # Abstract class to implement Daemons
 #
 # Features:
-# * lock and write PID file /var/run/$name.pid to make sure only
+# * lock and write PID file /run/$name.pid to make sure only
 #   one instance is running.
 # * keep lock open during restart
 # * correctly daemonize (redirect STDIN/STDOUT)
@@ -431,7 +431,7 @@ sub new {
 
 	$self = bless {
 	    name => $name,
-	    pidfile => "/var/run/${name}.pid",
+	    pidfile => "/run/${name}.pid",
 	    workers => {},
 	    old_workers => {},
 	}, $class;
diff --git a/src/PVE/Network.pm b/src/PVE/Network.pm
index a004c04..35325c8 100644
--- a/src/PVE/Network.pm
+++ b/src/PVE/Network.pm
@@ -858,7 +858,7 @@ sub get_ip_from_hostname {
 
 sub lock_network {
     my ($code, @param) = @_;
-    my $res = lock_file('/var/lock/pve-network.lck', 10, $code, @param);
+    my $res = lock_file('/run/lock/pve-network.lck', 10, $code, @param);
     die $@ if $@;
     return $res;
 }
diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index df481ab..fe6c699 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -989,7 +989,7 @@ sub next_unused_port {
 	return $newport;
     };
 
-    my $p = lock_file('/var/lock/pve-ports.lck', 10, $code);
+    my $p = lock_file('/run/lock/pve-ports.lck', 10, $code);
     die $@ if $@;
 
     die "unable to find free port (${range_start}-${range_end})\n" if !$p;
-- 
2.49.0




--===============0835599186114756477==
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

--===============0835599186114756477==--