From 994903f001c042ea4067331f8f668e5ddc9de51c Mon Sep 17 00:00:00 2001
From: Bill Peck <bpeck@redhat.com>
Date: Thu, 23 May 2013 14:48:38 -0400
Subject: Fix for rhel3

---
 kernel/kernelinstall/runtest.sh | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/kernel/kernelinstall/runtest.sh b/kernel/kernelinstall/runtest.sh
index 21073ef..3debc27 100755
--- a/kernel/kernelinstall/runtest.sh
+++ b/kernel/kernelinstall/runtest.sh
@@ -401,7 +401,12 @@ function SelectKernelGrubby ()
     fi
 
     # match vmlinuz with $VR and $EXTRA, take first shortest match
-    vmlinuz=$(rpm -ql $testkernbase.$kernarch | grep -e /vmlinu.-$VR | grep "$EXTRA" | awk '{print length"\t"$0}' | sort -n | cut -f2- | head -1)
+    if [ -e "/etc/grub.conf" ]; then
+        # If /etc/grub.conf exists, make sure the requested kernel exists in /etc/grub.conf
+        vmlinuz=$(for kernel in $(rpm -ql $testkernbase | grep -e /vmlinu.-$VR | grep "$EXTRA" | awk '{print length"\t"$0}' | sort -n | cut -f2-); do grep -q ${kernel#/boot} /etc/grub.conf && echo $kernel; done | head -1)
+    else
+       vmlinuz=$(rpm -ql $testkernbase.$kernarch | grep -e /vmlinu.-$VR | grep "$EXTRA" | awk '{print length"\t"$0}' | sort -n | cut -f2- | head -1)
+    fi
 
     if [ -n "$vmlinuz" ]; then
         grubby --set-default "$vmlinuz"
-- 
cgit