diff options
| author | Kristian Schuster <kristian.s@outlook.de> | 2019-09-29 18:42:07 +0300 |
|---|---|---|
| committer | Kristian Schuster <kristian.s@outlook.de> | 2019-09-29 18:42:07 +0300 |
| commit | 001cd85183d19e20ce012cd5c527d8d7d296b6be (patch) | |
| tree | 249e0396dca3622c308327814eeb936d297eb484 /include/tests_kernel | |
| parent | 364b770c648c7a4ee4ab8f3a5dd3e07dbe1f1461 (diff) | |
kernel-test: additional improvements for required reboot detection
Diffstat (limited to 'include/tests_kernel')
| -rw-r--r-- | include/tests_kernel | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/tests_kernel b/include/tests_kernel index 95634786..f0846e14 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -542,17 +542,16 @@ 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 -o -f $(ls -t ${ROOTDIR}boot/vmlinuz-* | head -1) ]; then + elif [ -f ${ROOTDIR}boot/vmlinuz-linux -o -f ${ROOTDIR}boot/vmlinuz-linux-lts -o -f $(ls -t ${ROOTDIR}boot/vmlinuz-* 2> /dev/null | head -1) ]; then if [ -f ${ROOTDIR}boot/vmlinuz-linux ]; then FOUND_VMLINUZ=${ROOTDIR}boot/vmlinuz-linux elif [ -f ${ROOTDIR}boot/vmlinuz-linux-lts ]; then FOUND_VMLINUZ=${ROOTDIR}boot/vmlinuz-linux-lts else - FOUND_VMLINUZ=$(ls -t ${ROOTDIR}boot/vmlinuz-* | head -1) + FOUND_VMLINUZ=$(ls -t ${ROOTDIR}boot/vmlinuz-* 2> /dev/null | head -1) fi - LogText "Result: /found /boot/vmlinuz-linux-lts (usually Arch Linux or similar)" + LogText "Result: /found ${FOUND_VMLINUZ} (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 |