[pve-devel] [PATCH proxmox-kernel-helper] pve-kernel -> proxmox-kernel rename

[Fabian Grünbichler]

and this one for proxmox-kernel-helper

On July 18, 2023 11:10 am, Fabian Grünbichler wrote:
> 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 <f.gruenbichler at proxmox.com>
> ---
>  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 <partition>"
>  	echo ""
> -	echo "    initialize EFI system partition at <partition> for automatic synchronization of pve-kernels and their associated initrds."
> +	echo "    initialize EFI system partition at <partition> 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 <add|remove> <kernel-version>"
>  	echo ""
> -	echo "    add/remove pve-kernel with ABI <kernel-version> to list of synced kernels, in addition to automatically selected ones."
> +	echo "    add/remove proxmox-kernel with ABI <kernel-version> 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 <kernel-version> [--next-boot]"
>  	echo ""
> -	echo "    pin pve-kernel with ABI <kernel-version> as the default entry to be booted."
> +	echo "    pin proxmox-kernel with ABI <kernel-version> as the default entry to be booted."
>  	echo "    with --next-boot sets <kernel-version> 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
> 
> 
> 
> _______________________________________________
> pve-devel mailing list
> pve-devel at lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
>