From d8ab98b84535c20e1467a8e4ef885ab617ed31e4 Mon Sep 17 00:00:00 2001 From: Michael Boelen Date: Sun, 31 Jul 2016 21:09:05 +0200 Subject: [KRNL-5830] ignore rescue image for kernels --- include/tests_kernel | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/tests_kernel b/include/tests_kernel index 96fc5bbb..dd289e85 100644 --- a/include/tests_kernel +++ b/include/tests_kernel @@ -529,14 +529,14 @@ # Extra current kernel version and replace dashes to allow numeric sort later on MYKERNEL=`uname -r | sed 's/\.[a-z].*.//g' | sed 's/-[a-z].*.//g' | sed 's/-/./g'` LogText "Result: using ${MYKERNEL} as my kernel version (stripped)" - FIND=`ls /boot/vmlinuz* 2> /dev/null` + FIND=$(ls /boot/vmlinuz* 2> /dev/null | grep -v rescue) if [ ! "${FIND}" = "" ]; then LogText "Result: found ${FIND}" # Display kernels, extract version numbers and sort them numeric per column (up to 6 numbers) - # Remove generic. and huge. for Slackware machines - KERNELS=`ls /boot/vmlinuz* | sed 's/vmlinuz-//' | sed 's/generic.//' | sed 's/huge.//' | sed 's/\.[a-z].*.//g' | sed 's/-[a-z].*.//g' | sed 's./boot/..' | sed 's/-/./g' | sort -n -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 -k6,6 -t \.` + # Ignore rescue images. Remove generic. and huge. for Slackware machines + KERNELS=`ls /boot/vmlinuz* | grep -v rescue | sed 's/vmlinuz-//' | sed 's/generic.//' | sed 's/huge.//' | sed 's/\.[a-z].*.//g' | sed 's/-[a-z].*.//g' | sed 's./boot/..' | sed 's/-/./g' | sort -n -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 -k6,6 -t \.` LogText "Output: ${KERNELS}" - elif [ ! `ls /boot/kernel* 2> /dev/null` = "" ]; then + elif [ ! "$(ls /boot/kernel* 2> /dev/null)" = "" ]; then LogText "Output: Found a kernel file in /boot" # Display kernels, extract version numbers and sort them numeric per column (up to 6 numbers) # Examples: -- cgit v1.2.3