diff options
| author | Kristian Schuster <kristian.s@outlook.de> | 2019-09-28 01:39:12 +0300 |
|---|---|---|
| committer | Kristian Schuster <kristian.s@outlook.de> | 2019-09-28 01:39:12 +0300 |
| commit | 364b770c648c7a4ee4ab8f3a5dd3e07dbe1f1461 (patch) | |
| tree | 238f174a243f82fc5a74d8376c721844ef157e91 /include/tests_kernel | |
| parent | b38031803d1350aa6af89663631fa7abe833219a (diff) | |
kernel-test: determine reboot requirement for more distros. Plus a few fixes
Diffstat (limited to 'include/tests_kernel')
| -rw-r--r-- | include/tests_kernel | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/include/tests_kernel b/include/tests_kernel index 56df2a99..95634786 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -527,6 +527,7 @@ for I in $(file ${ROOTDIR}boot/vmlinuz-linux); do if [ ${NEXTLINE} -eq 1 ]; then FINDVERSION="${I}" + break else # Searching for the Linux kernel after the keyword 'version' if [ "${I}" = "version" ]; then NEXTLINE=1; fi @@ -541,16 +542,28 @@ else ReportException "${TEST_NO}:1" "Can't determine kernel version on disk, need debug data" fi - elif [ -f ${ROOTDIR}boot/vmlinuz-linux -o -f ${ROOTDIR}boot/vmlinuz-linux-lts ]; then + elif [ -f ${ROOTDIR}boot/vmlinuz-linux -o -f ${ROOTDIR}boot/vmlinuz-linux-lts -o -f $(ls -t ${ROOTDIR}boot/vmlinuz-* | head -1) ]; then if [ -f ${ROOTDIR}boot/vmlinuz-linux ]; then - LogText "Result: /found /boot/vmlinuz-linux (usually Arch Linux or similar)" - LogText "Test: checking kernel version on disk" - VERSION_ON_DISK=$(${FILEBINARY} -b ${ROOTDIR}boot/vmlinuz-linux | ${AWKBINARY} '{ if ($1=="Linux" && $7=="version") { print $8 }}') + FOUND_VMLINUZ=${ROOTDIR}boot/vmlinuz-linux + elif [ -f ${ROOTDIR}boot/vmlinuz-linux-lts ]; then + FOUND_VMLINUZ=${ROOTDIR}boot/vmlinuz-linux-lts else - LogText "Result: /found /boot/vmlinuz-linux-lts (usually Arch Linux or similar)" - LogText "Test: checking kernel version on disk" - VERSION_ON_DISK=$(${FILEBINARY} -b ${ROOTDIR}boot/vmlinuz-linux-lts | ${AWKBINARY} '{ if ($1=="Linux" && $7=="version") { print $8 }}') + FOUND_VMLINUZ=$(ls -t ${ROOTDIR}boot/vmlinuz-* | head -1) fi + LogText "Result: /found /boot/vmlinuz-linux-lts (usually Arch Linux or similar)" + LogText "Test: checking kernel version on disk" + #VERSION_ON_DISK=$(${FILEBINARY} -b ${FOUND_VMLINUZ} | ${AWKBINARY} '{ if ($1=="Linux" && $7=="version") { print $8 }}') + NEXTLINE=0 + VERSION_ON_DISK="" + for I in $(file ${FOUND_VMLINUZ}); do + if [ ${NEXTLINE} -eq 1 ]; then + VERSION_ON_DISK="${I}" + break + else + # Searching for the Linux kernel after the keyword 'version' + if [ "${I}" = "version" ]; then NEXTLINE=1; fi + fi + done if [ -n "${VERSION_ON_DISK}" ]; then LogText "Result: found version ${VERSION_ON_DISK}" ACTIVE_KERNEL=$(uname -r) |