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 EEB7B1FF176
	for <inbox@lore.proxmox.com>; Sat,  7 Dec 2024 09:43:18 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id 4633611C40;
	Sat,  7 Dec 2024 09:43:18 +0100 (CET)
To: pve-devel@lists.proxmox.com
Date: Sat,  7 Dec 2024 17:42:28 +0900
MIME-Version: 1.0
Message-ID: <mailman.75.1733560997.332.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 dab] fix an error on creating a debian trixie
 image
Content-Type: multipart/mixed; boundary="===============8493594567714019643=="
Errors-To: pve-devel-bounces@lists.proxmox.com
Sender: "pve-devel" <pve-devel-bounces@lists.proxmox.com>

--===============8493594567714019643==
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) server-digest SHA256)
	(No client certificate requested)
	by lists.proxmox.com (Postfix) with ESMTPS id D7787C1299
	for <pve-devel@lists.proxmox.com>; Sat,  7 Dec 2024 09:43:16 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
	by firstgate.proxmox.com (Proxmox) with ESMTP id B551811BD2
	for <pve-devel@lists.proxmox.com>; Sat,  7 Dec 2024 09:43:16 +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) server-digest SHA256)
	(No client certificate requested)
	by firstgate.proxmox.com (Proxmox) with ESMTPS
	for <pve-devel@lists.proxmox.com>; Sat,  7 Dec 2024 09:43:12 +0100 (CET)
Received: from mail-gw3.jing.rocks (localhost [127.0.0.1])
	by mail-gw3.jing.rocks (Proxmox) with ESMTP id 2FCAB2AF0C
	for <pve-devel@lists.proxmox.com>; Sat,  7 Dec 2024 17:43:02 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jing.rocks; h=cc
	:cc:content-transfer-encoding:date:from:from:message-id
	:mime-version:reply-to:subject:subject:to:to; s=mail-gw; bh=Vysv
	/3ZQcrq1eYsL0y/TUPuiFgvundTW6UsAD2AKZGA=; b=UIxRC36jyexQtXt3+h1P
	dZX9xhUfCTezR7Itt7JJefWGFLE1/BJUZr19x0fjjI3A5SXbMo3Inac6CBNN9dqK
	CCdl0LwIvzSPg4oGrLWqOtzvOGwXE+jlIzX4MamCzyT+4DBJunppy3OWV9AdPdWU
	gY6ISOUJHF3UbMfZliVIt50cBRFuWIO0FkncynCI6QPAkkvGZZNiXuoLYbc0yUB9
	evvyfFIth4BuJaIZoQ+Tvp9JXGAFzmrra+k2mHbb42qJz832ROgyyNx829Mx47gj
	w6OrGp/67IKR6k5bsTBNxQ0TvO1MLllBuJ3pT9Xg0MrfodwEZci3nV20boVxKr3G
	Hg==
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 AFB202AB6F
	for <pve-devel@lists.proxmox.com>; Sat,  7 Dec 2024 17:42:59 +0900 (JST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=jing.rocks;
	s=default; t=1733560979;
	bh=PVd8eNswa6t/bVpDv38GOvRvtZ69xRSTEwuacn9+wTU=;
	h=From:To:Cc:Subject:Date:From;
	b=1M9o9Zq0ZdNteeqe3eKIaUckXjhd2in5FGEpETROTvOrd84sbecQEZe5UFg59PS/r
	 8owRKnbkeWAA3kMkvmppqIuOKQU5ieyK0L0GEFzQM5jWfN7WDCT91bww+YlFdtdO7B
	 tIUmMWVdXvVykUYWUyB2YrqvqZhm6KM24fDDzkblo76aaywUwAWzYkyo5PZOMC6Ny4
	 jEZLhYzYVgRllEXAfEaTWy0xEvIjFivIWJbq0lEEMp7PmyRlL3g6XVqqoDh2h0oZR3
	 R7mjdOiCi2apDQheJO8K8MH/hy/DC2ez/Zqzz9CgRUH8WCWH0IChPBRfWZpDb+pTTJ
	 PZs6h2CUP9PNg==
Received: from X570AM.jing.rocks (X570AM.jing.rocks [IPv6:240b:10:f00:1b00::7e82])
	(Authenticated sender: jing@jing.rocks)
	by mail.jing.rocks (Postfix) with ESMTPSA id 9343059E69;
	Sat,  7 Dec 2024 17:42:59 +0900 (JST)
From: Jing Luo <jing@jing.rocks>
To: pve-devel@lists.proxmox.com
Cc: Jing Luo <jing@jing.rocks>
Subject: [PATCH dab] fix an error on creating a debian trixie image
Date: Sat,  7 Dec 2024 17:42:28 +0900
Message-ID: <20241207084248.1067860-1-jing@jing.rocks>
X-Mailer: git-send-email 2.47.1
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results:  0
	AWL                    -0.002 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
	RCVD_IN_VALIDITY_CERTIFIED_BLOCKED  0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
	RCVD_IN_VALIDITY_RPBL_BLOCKED  0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
	RCVD_IN_VALIDITY_SAFE_BLOCKED  0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked.  See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information.
	SPF_HELO_NONE           0.001 SPF: HELO does not publish an SPF Record
	SPF_PASS               -0.001 SPF: sender matches SPF record

debian trixie no longer ships "/etc/sysctl.conf", so this fix is needed.

Signed-off-by: Jing Luo <jing@jing.rocks>
---
 PVE/DAB.pm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/PVE/DAB.pm b/PVE/DAB.pm
index f318be5..9e80d6e 100644
--- a/PVE/DAB.pm
+++ b/PVE/DAB.pm
@@ -1601,7 +1601,9 @@ EOD
     $cmd .= ' -e \'s/^\(fs\.inotify\.max_user_watches.*\)/#\1/\'';
     $cmd .= ' -e \'s/^\(vm\.mmap_min_addr.*\)/#\1/\'';
     $cmd .= " -i '$rootdir/etc/sysctl.conf'";
-    $self->run_command ($cmd);
+    if (-f "$rootdir/etc/sysctl.conf") {
+	$self->run_command ($cmd);
+    }
 
     my $bindv6only = "$rootdir/etc/sysctl.d/bindv6only.conf";
     if (-f $bindv6only) {
-- 
2.47.1




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

--===============8493594567714019643==--