kernel-test: additional improvements for required reboot detection

This commit is contained in:
Kristian Schuster 2019-09-29 17:42:07 +02:00
parent 364b770c64
commit 001cd85183
No known key found for this signature in database
GPG Key ID: 41D9CF63A7E6A4EB

View File

@ -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