diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2020-10-22 14:28:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-22 14:28:05 +0300 |
| commit | 1fe12c0023bb2ee3d1416df324c9fa482ec53374 (patch) | |
| tree | 1d83190a32c0c9267c283a9a7da4f65028294c47 | |
| parent | 9f9fd51e1db93897bc58e29307478b378cdcb0e7 (diff) | |
| parent | f65f4d011b88f7e3d16daaabdd851c7ec3c8b08b (diff) | |
Merge pull request #1008 from kolenichsj/master
Alpine Improvements
| -rw-r--r-- | db/software-eol.db | 8 | ||||
| -rw-r--r-- | include/tests_kernel | 5 |
2 files changed, 12 insertions, 1 deletions
diff --git a/db/software-eol.db b/db/software-eol.db index 63baa280..ea23509c 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 diff --git a/include/tests_kernel b/include/tests_kernel index d0f5cdcd..b3ce61f7 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 items like /boot/vm5.3.7 or /boot/vmlinuz-5.3.7-1-default. Get newest file (ls -t and pipe into head) # Note: ignore a rescue kernel (e.g. CentOS) @@ -679,7 +682,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 |