kernel lists: add/handle -signed variant

only the package name is different, the file paths are identical and they are
not co-installable.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Reviewed-by: Stoiko Ivanov <s.ivanov@proxmox.com>
Tested-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/src/proxmox-boot/functions b/src/proxmox-boot/functions
index b55a164f565318c09a6c4959a098de014ed54917..a650c6fa112886d7d8042c73e0ee3a0ab5218e20 100755 (executable)
--- a/src/proxmox-boot/functions
+++ b/src/proxmox-boot/functions
@@ -31,7 +31,7 @@ kernel_keep_versions() {
        test -n "$DPKG" || DPKG="/usr/bin/dpkg"
 
        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#:[^:]\+ # #')"
+          | sed -e 's#^pve-kernel-##' -e 's#^proxmox-kernel-##' -e 's#-signed$##' -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 ef1b7481e9d6df44bf993a94862986c0210f553b..8f4d9cdc53921ab4233dc9bb7434d08dc235616e 100755 (executable)
--- a/src/proxmox-boot/proxmox-auto-removal
+++ b/src/proxmox-boot/proxmox-auto-removal
@@ -21,6 +21,7 @@ generate_apt_config() {
                escaped_kver="$(echo "$kernel" |  sed -e 's#\([\.\+]\)#\\\1#g')"
                echo "   \"^pve-kernel-${escaped_kver}$\";"
                echo "   \"^proxmox-kernel-${escaped_kver}$\";"
+               echo "   \"^proxmox-kernel-${escaped_kver}-signed$\";"
        done
        echo '};'
        if [ "${APT_AUTO_REMOVAL_KERNELS_DEBUG:-false}" = 'true' ]; then