diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2022-01-31 17:07:50 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 17:07:50 +0300 |
| commit | a0e9e3d3635218b554ad49f87d8f7c36fb87b933 (patch) | |
| tree | b2ba58e48b409368a003e8690201558bed08d887 | |
| parent | a138f9e402bd420affeb8f37ff238da01562392b (diff) | |
| parent | 12ad1ca6bdea1f322001a0d2452469fd326fd3c3 (diff) | |
Merge pull request #1263 from pyllyukko/needs_restarting
KRNL-5830: Check for /var/run/needs_restarting
| -rw-r--r-- | include/tests_kernel | 38 |
1 files changed, 21 insertions, 17 deletions
diff --git a/include/tests_kernel b/include/tests_kernel index 610fd325..1eed32ad 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -615,25 +615,29 @@ Register --test-no KRNL-5830 --os Linux --weight L --network NO --category security --description "Checking if system is running on the latest installed kernel" if [ ${SKIPTEST} -eq 0 ]; then REBOOT_NEEDED=2 - FILE="${ROOTDIR}var/run/reboot-required.pkgs" - LogText "Test: Checking presence ${FILE}" - if [ -f ${FILE} ]; then - LogText "Result: file ${FILE} exists" - FIND=$(${WCBINARY} -l < ${FILE}) - if [ "${FIND}" = "0" ]; then - LogText "Result: No reboot needed (file empty)" - REBOOT_NEEDED=0 + for FILE in "${ROOTDIR}var/run/reboot-required.pkgs" "${ROOTDIR}var/run/needs_restarting" + do + LogText "Test: Checking presence ${FILE}" + if [ -f ${FILE} ]; then + LogText "Result: file ${FILE} exists" + FIND=$(${WCBINARY} -l < ${FILE}) + if [ "${FIND}" = "0" ]; then + LogText "Result: No reboot needed (file empty)" + REBOOT_NEEDED=0 + break + else + PKGSCOUNT=$(${WCBINARY} -l < ${FILE}) + LogText "Result: reboot is needed, related to ${PKGSCOUNT} packages" + for I in ${FIND}; do + LogText "Package: ${I}" + done + REBOOT_NEEDED=1 + break + fi else - PKGSCOUNT=$(${WCBINARY} -l < ${FILE}) - LogText "Result: reboot is needed, related to ${PKGSCOUNT} packages" - for I in ${FIND}; do - LogText "Package: ${I}" - done - REBOOT_NEEDED=1 + LogText "Result: file ${FILE} not found" fi - else - LogText "Result: file ${FILE} not found" - fi + done # Check if /boot exists if [ -d "${ROOTDIR}boot" ]; then |