diff options
| author | Bill Peck <bpeck@redhat.com> | 2013-05-14 13:37:41 -0400 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2013-05-14 13:37:41 -0400 |
| commit | b3af8def8f0b226ea8ada0b7e1acbf6955569600 (patch) | |
| tree | e7c278d8c7fc8fe1f45127b30b911bdc91e873db /kernel/kernelinstall/runtest.sh | |
| parent | 4e6ae7aabc53dada0f532d71f54a5ae505c6988d (diff) | |
| download | tests-b3af8def8f0b226ea8ada0b7e1acbf6955569600.tar.gz tests-b3af8def8f0b226ea8ada0b7e1acbf6955569600.tar.xz tests-b3af8def8f0b226ea8ada0b7e1acbf6955569600.zip | |
Updated kernelinstall using kernel/include
Diffstat (limited to 'kernel/kernelinstall/runtest.sh')
| -rwxr-xr-x | kernel/kernelinstall/runtest.sh | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/kernel/kernelinstall/runtest.sh b/kernel/kernelinstall/runtest.sh index 6c962e4..346f3b6 100755 --- a/kernel/kernelinstall/runtest.sh +++ b/kernel/kernelinstall/runtest.sh @@ -303,12 +303,13 @@ 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 + ZZZ=${EXTRA:3} if [ "${KVER::3}" = "3.0" ]; then # MRG-2.1 - EXTRA=$(echo $EXTRA | awk -F- '{print $2}') + EXTRA=$ZZZ else # MRG-2.2 or newer - EXTRA=".x86_64.$EXTRA" + EXTRA=".x86_64.$ZZZ" fi else # MRG-2.0 @@ -570,13 +571,8 @@ 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 - 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 + # MRG-2.1 or newer + KVAR="${KVAR:3}" else # MRG-2.0 KVAR=$(echo $KVAR | awk -F- '{print $1 $2}') |