public inbox for pve-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: "Fabian Grünbichler" <f.gruenbichler@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [pve-devel] [PATCH proxmox-backup] handle pve-kernel -> proxmox-kernel rename
Date: Tue, 18 Jul 2023 11:10:55 +0200	[thread overview]
Message-ID: <20230718091102.6631-3-f.gruenbichler@proxmox.com> (raw)
In-Reply-To: <20230718091102.6631-1-f.gruenbichler@proxmox.com>

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
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 ``<partition>``. 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<Vec<APTUpdateInfo>, 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<APTUpdateInfo> = 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





  parent reply	other threads:[~2023-07-18  9:11 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-07-18  9:10 [pve-devel] [PATCH pve-kernel++ 0/9] secure boot improvements, kernel packages rename Fabian Grünbichler
2023-07-18  9:10 ` [pve-devel] [PATCH pmg-api] handle pve-kernel -> proxmox-kernel rename Fabian Grünbichler
2023-07-25 15:06   ` Thomas Lamprecht
2023-07-26  7:34     ` Fabian Grünbichler
2023-07-18  9:10 ` Fabian Grünbichler [this message]
2023-07-18  9:10 ` [pve-devel] [PATCH] switch to proxmox-kernel-6.2 Fabian Grünbichler
2023-07-18 13:00   ` [pve-devel] [PATCH proxmox-backup-meta] " Fabian Grünbichler
2023-07-18  9:10 ` [pve-devel] [PATCH] pve-kernel -> proxmox-kernel rename Fabian Grünbichler
2023-07-18 13:00   ` [pve-devel] [PATCH proxmox-kernel-helper] " Fabian Grünbichler
2023-07-18  9:10 ` [pve-devel] [PATCH] switch to proxmox-kernel-6.2/proxmox-headers-6.2 Fabian Grünbichler
2023-07-18 13:01   ` [pve-devel] [PATCH proxmox-mailgateway] " Fabian Grünbichler
2023-07-25 15:12   ` [pve-devel] [PATCH] " Thomas Lamprecht
2023-07-26  7:25     ` Fabian Grünbichler
2023-07-18  9:10 ` [pve-devel] [PATCH proxmox-ve] " Fabian Grünbichler
2023-07-18  9:11 ` [pve-devel] [PATCH 1/2] fix #4831: build: sign modules and enable lockdown Fabian Grünbichler
2023-07-18 13:02   ` [pve-devel] [PATCH pve-kernel " Fabian Grünbichler
2023-07-18  9:11 ` [pve-devel] [PATCH 2/2] integrate meta packages and change prefix Fabian Grünbichler
2023-07-18  9:11 ` [pve-devel] [PATCH manager] handle pve-kernel -> proxmox-kernel rename Fabian Grünbichler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230718091102.6631-3-f.gruenbichler@proxmox.com \
    --to=f.gruenbichler@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal