diff options
| author | Bill Peck <bpeck@redhat.com> | 2013-04-23 13:16:19 -0400 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2013-04-23 13:16:19 -0400 |
| commit | 44188568f1cd5d8f36fe3361acb9a6f3f7060b48 (patch) | |
| tree | 4dd09d2c9dce6e2e0ba899400f3fcf9cd37d8983 /kernel | |
| parent | dc53ea12cc09dafa5bef893ca805386e4ce8965c (diff) | |
| download | tests-44188568f1cd5d8f36fe3361acb9a6f3f7060b48.tar.gz tests-44188568f1cd5d8f36fe3361acb9a6f3f7060b48.tar.xz tests-44188568f1cd5d8f36fe3361acb9a6f3f7060b48.zip | |
Use /boot/config-$(uname -r) instead of find on vmlinu\*
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/kernelinstall/Makefile | 1 | ||||
| -rwxr-xr-x | kernel/kernelinstall/runtest.sh | 28 |
2 files changed, 16 insertions, 13 deletions
diff --git a/kernel/kernelinstall/Makefile b/kernel/kernelinstall/Makefile index b29a209..540c9d9 100644 --- a/kernel/kernelinstall/Makefile +++ b/kernel/kernelinstall/Makefile @@ -49,4 +49,5 @@ $(METADATA): @echo "Requires: iproute ethtool" >> $(METADATA) @echo "RunFor: kernel" >> $(METADATA) @echo "RunFor: kernel-headers" >> $(METADATA) + @echo "RepoRequires: kernel/include" >> $(METADATA) @echo "License: GPL" >> $(METADATA) diff --git a/kernel/kernelinstall/runtest.sh b/kernel/kernelinstall/runtest.sh index 2653850..96eff71 100755 --- a/kernel/kernelinstall/runtest.sh +++ b/kernel/kernelinstall/runtest.sh @@ -2,6 +2,7 @@ # Source the common test script helpers . /usr/bin/rhts_environment.sh +. /mnt/tests/kernel/include/runtest.sh CUR_TIME=$(date --date="$(date --utc)" +%s) # control where to log debug messages to: @@ -302,10 +303,11 @@ function SelectKernel () # if it is MRG-2.x RHEL6 if $(rpm -qf /etc/redhat-release | grep -q "redhat-release-server-6"); then if [ "${KVER::2}" = "3." ]; then - # MRG-2.1 - EXTRA=$(echo $EXTRA | awk -F- '{print $2}') - if [ "${KVER::3}" = "3.2" ]; then - # MRG-2.2 + if [ "${KVER::3}" = "3.0" ]; then + # MRG-2.1 + EXTRA=$(echo $EXTRA | awk -F- '{print $2}') + else + # MRG-2.2 or newer EXTRA=".x86_64.$EXTRA" fi else @@ -313,6 +315,7 @@ function SelectKernel () EXTRA=$(echo $EXTRA | awk -F- '{print $1 $2}') fi else + # MRG-1.x on RHEL 5 EXTRA=$(echo $EXTRA | awk -F- '{print $2}') fi DeBug "After EXTRA=$EXTRA" @@ -567,10 +570,11 @@ function CheckKernel () # if it is MRG-2.x RHEL6 if $(rpm -qf /etc/redhat-release | grep -q "redhat-release-server-6"); then if [ "${KVER::2}" = "3." ]; then - # MRG-2.1 - KVAR=$(echo $KVAR | awk -F- '{print $2}') - if [ "${KVER::3}" = "3.2" ]; then - # MRG-2.2 + if [ "${KVER::3}" = "3.0" ]; then + # MRG-2.1 + KVAR=$(echo $KVAR | awk -F- '{print $2}') + else + # MRG-2.2 or newer KVAR=".x86_64.$KVAR" fi else @@ -578,7 +582,8 @@ function CheckKernel () KVAR=$(echo $KVAR | awk -F- '{print $1 $2}') fi else - KVAR=$(echo $KVAR | awk -F- '{print $2}') + # MRG-1.x o RHEL 5 + KVAR=$(echo $KVAR | awk -F- '{print $2}') fi DeBug "After KVAR=$KVAR" fi @@ -900,11 +905,8 @@ function Main () testver=$(rpm -qf $0) DeBug "$testver" -# Use the installed kernels to find out the arch string that must be reomved from uname -r -kernarch=$(rpm -qf --qf '%{arch}\n' $(find /boot -name vmlinu\*) | head -n 1) - # Current kernel variables -runkernel=$(/bin/uname -r | sed -e "s/.${kernarch}*.//g") +runkernel=$K_RUNNING_VR kernbase=$(rpm -q --queryformat '%{name}-%{version}-%{release}\n' -qf /boot/config-$(uname -r)) kername=$(rpm -q --queryformat '%{name}\n' -qf /boot/config-$(uname -r)) kernver=$(rpm -q --queryformat '%{version}\n' -qf /boot/config-$(uname -r)) |