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 86822E306 for ; Tue, 18 Jul 2023 11:11:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6C6071875C for ; Tue, 18 Jul 2023 11:11:22 +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:21 +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 916E142FD9 for ; Tue, 18 Jul 2023 11:11:21 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pve-devel@lists.proxmox.com Date: Tue, 18 Jul 2023 11:10:57 +0200 Message-Id: <20230718091102.6631-5-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] 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:22 -0000 following the rename in our kernel packaging, otherwise the scripts here wouldn't pick up the new kernels (except if currently booted). Signed-off-by: Fabian Grünbichler --- src/bin/proxmox-boot-tool | 6 +++--- src/proxmox-boot/functions | 4 ++-- src/proxmox-boot/proxmox-auto-removal | 3 ++- src/proxmox-boot/proxmox-boot-sync | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/bin/proxmox-boot-tool b/src/bin/proxmox-boot-tool index 302974b..35fb721 100755 --- a/src/bin/proxmox-boot-tool +++ b/src/bin/proxmox-boot-tool @@ -361,7 +361,7 @@ help() { echo "" echo "USAGE: $0 init " echo "" - echo " initialize EFI system partition at for automatic synchronization of pve-kernels and their associated initrds." + echo " initialize EFI system partition at for automatic synchronization of Proxmox kernels and their associated initrds." echo "" echo "USAGE: $0 reinit" echo "" @@ -377,12 +377,12 @@ help() { echo "" echo "USAGE: $0 kernel " echo "" - echo " add/remove pve-kernel with ABI to list of synced kernels, in addition to automatically selected ones." + echo " add/remove proxmox-kernel with ABI to list of synced kernels, in addition to automatically selected ones." echo " NOTE: you need to manually run 'refresh' once you're finished with adding/removing kernels from the list" echo "" echo "USAGE: $0 kernel pin [--next-boot]" echo "" - echo " pin pve-kernel with ABI as the default entry to be booted." + echo " pin proxmox-kernel with ABI as the default entry to be booted." echo " with --next-boot sets only for the next boot." echo " NOTE: you need to manually run 'refresh' once you're finished with pinning kernels" echo "" diff --git a/src/proxmox-boot/functions b/src/proxmox-boot/functions index 8193742..b55a164 100755 --- a/src/proxmox-boot/functions +++ b/src/proxmox-boot/functions @@ -30,8 +30,8 @@ kernel_keep_versions() { eval "$(apt-config shell DPKG Dir::bin::dpkg/f)" test -n "$DPKG" || DPKG="/usr/bin/dpkg" - list="$("${DPKG}" -l | awk '/^[ih][^nc][ ]+pve-kernel-[0-9]+\./ && $2 !~ /-dbg(:.*)?$/ && $2 !~ /-dbgsym(:.*)?$/ { print $2; }' \ - | sed -e 's#^pve-kernel-##' -e 's#:[^:]\+ # #')" + list="$("${DPKG}" -l | awk '/^[ih][^nc][ ]+(proxmox|pve)-kernel-[0-9]+\./ && $2 !~ /-dbg(:.*)?$/ && $2 !~ /-dbgsym(:.*)?$/ { print $2; }' \ + | sed -e 's#^pve-kernel-##' -e 's#^proxmox-kernel-##' -e 's#:[^:]\+ # #')" sorted_list="$(echo "$list" | sort --unique --reverse --version-sort)" diff --git a/src/proxmox-boot/proxmox-auto-removal b/src/proxmox-boot/proxmox-auto-removal index 8fd27ce..ef1b748 100755 --- a/src/proxmox-boot/proxmox-auto-removal +++ b/src/proxmox-boot/proxmox-auto-removal @@ -20,13 +20,14 @@ generate_apt_config() { for kernel in $kernels; do escaped_kver="$(echo "$kernel" | sed -e 's#\([\.\+]\)#\\\1#g')" echo " \"^pve-kernel-${escaped_kver}$\";" + echo " \"^proxmox-kernel-${escaped_kver}$\";" done echo '};' if [ "${APT_AUTO_REMOVAL_KERNELS_DEBUG:-false}" = 'true' ]; then cat <<-EOF /* Debug information: # dpkg list: - $(dpkg -l | grep -F 'pve-kernel' || true) + $(dpkg -l | grep -F -e 'pve-kernel' -e 'proxmox-kernel' || true) # list of installed kernel packages: $kernels */ diff --git a/src/proxmox-boot/proxmox-boot-sync b/src/proxmox-boot/proxmox-boot-sync index 5bdd72e..3058fd9 100644 --- a/src/proxmox-boot/proxmox-boot-sync +++ b/src/proxmox-boot/proxmox-boot-sync @@ -4,7 +4,7 @@ set -e # Only run the refresh if update-initramfs has been called manually. # If this script is being run as part of a post-kernel-install hook, -# this variable will be set to 1 and we do nothing, since our pve-kernel +# this variable will be set to 1 and we do nothing, since our proxmox-kernel # hooks will update the ESPs all at once anyway. if [ -z "$INITRAMFS_TOOLS_KERNEL_HOOK" ]; then /usr/sbin/proxmox-boot-tool refresh --hook 'zz-proxmox-boot' -- 2.39.2