From ec551d732d52e00cde12ee3d6d85ed699dca0d0e Mon Sep 17 00:00:00 2001 From: Steve Kolenich Date: Mon, 10 Aug 2020 12:26:55 -0400 Subject: Added Alpine Linux EOL dates --- db/software-eol.db | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/db/software-eol.db b/db/software-eol.db index 2412a203..63939bcb 100644 --- a/db/software-eol.db +++ b/db/software-eol.db @@ -14,6 +14,14 @@ # For rolling releases or releases that do not (currently have an EOL date, leave field three empty and set field four to -1. # Full string for CentOS can be something like 'CentOS Linux 8 (Core)'. As this does not correctly match, shorter string is used for matching. # +# Alpine - https://wiki.alpinelinux.org/wiki/Alpine_Linux:Releases +# +os:Alpine 3.12:2022-05-01:1651377600 +os:Alpine 3.11:2021-11-01:1635739200 +os:Alpine 3.10:2021-05-01:1619841600 +os:Alpine 3.9:2020-11-01:1604203200 +os:Alpine 3.8:2020-05-01:1588305600 +# # Amazon Linux # # Note: shortest entry is listed at end due to regular expression matching being used -- cgit v1.2.3 From f65f4d011b88f7e3d16daaabdd851c7ec3c8b08b Mon Sep 17 00:00:00 2001 From: Steve Kolenich Date: Mon, 10 Aug 2020 12:27:30 -0400 Subject: Improve detecting kernel version on disk Improve handling of kenrel files /boot/vmlinuz-linux-lts /boot/vmlinuz-linux /boot/vmlinuz-lts by updateing RegEx and adding elif this corrects issue where version is identified as 'linux' or 'lts' causing false report that a reboot is needed --- include/tests_kernel | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/tests_kernel b/include/tests_kernel index 011d02c6..56e7e46f 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -664,6 +664,9 @@ elif [ -f ${ROOTDIR}boot/vmlinuz-linux-lts ]; then LogText "Result: found ${ROOTDIR}boot/vmlinuz-linux-lts" FOUND_VMLINUZ=${ROOTDIR}boot/vmlinuz-linux-lts + elif [ -f ${ROOTDIR}boot/vmlinuz-lts ]; then + LogText "Result: found ${ROOTDIR}boot/vmlinuz-lts" + FOUND_VMLINUZ=${ROOTDIR}boot/vmlinuz-lts else # Match on /boot/vm5.3.7 or /boot/vmlinuz-5.3.7-1-default FOUND_VMLINUZ=$(${LSBINARY} -t ${ROOTDIR}boot/vm[l0-9]* 2> /dev/null | ${HEADBINARY} -1) @@ -678,7 +681,7 @@ VERSION_ON_DISK=$(echo ${FOUND_VMLINUZ} | ${SEDBINARY} 's#^/boot/##' | ${SEDBINARY} 's/^vmlinuz-//') LogText "Result: version derived from file name is '${VERSION_ON_DISK}'" elif [ -f "${FOUND_VMLINUZ}" ]; then - VERSION_ON_DISK=$(echo ${FOUND_VMLINUZ} | ${SEDBINARY} 's#^/boot/##' | ${SEDBINARY} 's/^vmlinuz-//') + VERSION_ON_DISK=$(echo ${FOUND_VMLINUZ} | ${SEDBINARY} 's#^/boot/##' | ${SEDBINARY} 's/^vmlinuz-//' | ${SEDBINARY} '$s/-\?\(linux\)\?-\?\(lts\)\?//') LogText "Result: version derived from file name is '${VERSION_ON_DISK}'" fi -- cgit v1.2.3