From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 089FBE27E for ; Tue, 18 Jul 2023 11:11:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6445818736 for ; Tue, 18 Jul 2023 11:11:15 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (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 ; Tue, 18 Jul 2023 11:11:14 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id A265E42FD9 for ; Tue, 18 Jul 2023 11:11:14 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 18 Jul 2023 11:10:55 +0200 Message-Id: <20230718091102.6631-3-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230718091102.6631-1-f.gruenbichler@proxmox.com> References: <20230718091102.6631-1-f.gruenbichler@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.070 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pve-devel] [PATCH proxmox-backup] handle pve-kernel -> proxmox-kernel rename X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Jul 2023 09:11:16 -0000 Signed-off-by: Fabian Grünbichler --- the meta package could get a versioned dep on the proxmox-backup-server package containing this change, but it is not strictly required. docs/system-booting.rst | 2 +- src/api2/node/apt.rs | 3 ++- src/bin/pbs2to3.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/system-booting.rst b/docs/system-booting.rst index caf46303..b9631c9e 100644 --- a/docs/system-booting.rst +++ b/docs/system-booting.rst @@ -84,7 +84,7 @@ Setting up a New Partition for use as Synced ESP ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ To format and initialize a partition as synced ESP, for example, after replacing a -failed vdev in an rpool, ``proxmox-boot-tool`` from ``pve-kernel-helper`` can be used. +failed vdev in an rpool, ``proxmox-boot-tool`` from ``proxmox-kernel-helper`` can be used. WARNING: the ``format`` command will format the ````. Make sure to pass in the right device/partition! diff --git a/src/api2/node/apt.rs b/src/api2/node/apt.rs index f7328b81..8e4f150d 100644 --- a/src/api2/node/apt.rs +++ b/src/api2/node/apt.rs @@ -354,7 +354,8 @@ pub fn get_versions() -> Result, Error> { } } - let is_kernel = |name: &str| name.starts_with("pve-kernel-"); + let is_kernel = + |name: &str| name.starts_with("pve-kernel-") || name.starts_with("proxmox-kernel"); let mut packages: Vec = Vec::new(); let pbs_packages = apt::list_installed_apt_packages( diff --git a/src/bin/pbs2to3.rs b/src/bin/pbs2to3.rs index 93191fb4..a052ae3a 100644 --- a/src/bin/pbs2to3.rs +++ b/src/bin/pbs2to3.rs @@ -131,7 +131,7 @@ impl Checker { let (krunning, kinstalled) = if self.upgraded { ( Regex::new(r"^6\.(?:2\.(?:[2-9]\d+|1[6-8]|1\d\d+)|5)[^~]*$")?, - "pve-kernel-6.2", + "proxmox-kernel-6.2", ) } else { (Regex::new(r"^(?:5\.(?:13|15)|6\.2)")?, "pve-kernel-5.15") -- 2.39.2