diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2021-01-07 13:30:51 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-07 13:30:51 +0300 |
| commit | c38c89ae4e5128fb3347835ca311ea3b1a255a75 (patch) | |
| tree | 0ae1ccf336ba8e416b91a2a55a132d6c38cca42e /include/tests_kernel | |
| parent | 0abf01b3583e595bca5370f8feb53da4ca8b467e (diff) | |
| parent | 4a03c613438d25944680ed22f67276dff755ff3c (diff) | |
Merge pull request #1004 from Varbin/1003-os-detection
Test for LINUX_VERSION before setting it again
Diffstat (limited to 'include/tests_kernel')
| -rw-r--r-- | include/tests_kernel | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/include/tests_kernel b/include/tests_kernel index 75f7bffc..5f6d0459 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -81,7 +81,7 @@ fi else LogText "Result: file ${ROOTDIR}etc/inittab not found" - if [ "${LINUX_VERSION}" = "Debian" -o "${LINUX_VERSION}" = "Ubuntu" ]; then + if [ "${LINUX_VERSION}" = "Debian" ] || [ "${LINUX_VERSION}" = "Ubuntu" ] || [ "${LINUX_VERSION_LIKE}" = "Debian" ] || [ "${LINUX_VERSION_LIKE}" = "Ubuntu" ]; then LogText "Test: Checking run level with who -r, for Debian based systems" FIND=$(who -r | ${AWKBINARY} '{ if ($1=="run-level") { print $2 } }') if HasData "${FIND}"; then @@ -368,7 +368,12 @@ # # Test : KRNL-5788 # Description : Checking availability new kernel - if [ "${LINUX_VERSION}" = "Debian" -o "${LINUX_VERSION}" = "Ubuntu" ]; then PREQS_MET="YES"; else PREQS_MET="NO"; fi + if [ "${LINUX_VERSION}" = "Debian" ] || [ "${LINUX_VERSION}" = "Ubuntu" ] || + [ "${LINUX_VERSION_LIKE}" = "Debian" ] || [ "${LINUX_VERSION_LIKE}" = "Ubuntu" ]; then + PREQS_MET="YES" + else + PREQS_MET="NO" + fi Register --test-no KRNL-5788 --os Linux --preqs-met ${PREQS_MET} --weight L --network NO --category security --description "Checking availability new Linux kernel" if [ ${SKIPTEST} -eq 0 ]; then HAS_VMLINUZ=0 |