From 001cd85183d19e20ce012cd5c527d8d7d296b6be Mon Sep 17 00:00:00 2001
From: Kristian Schuster <kristian.s@outlook.de>
Date: Sun, 29 Sep 2019 17:42:07 +0200
Subject: [PATCH] kernel-test: additional improvements for required reboot
 detection

---
 include/tests_kernel | 7 +++----
 1 file 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