diff options
| author | Bill Peck <bpeck@redhat.com> | 2014-06-18 11:42:36 -0400 |
|---|---|---|
| committer | Bill Peck <bpeck@redhat.com> | 2014-06-18 11:42:36 -0400 |
| commit | 351e7f00f0073d825e3faa9216bab230ff488a5e (patch) | |
| tree | 323fa28ae7ceb05d16eaf3697b3508b41d59ea51 | |
| parent | b81acc58e24227379093000edd61818029441686 (diff) | |
| download | tests-351e7f00f0073d825e3faa9216bab230ff488a5e.tar.gz tests-351e7f00f0073d825e3faa9216bab230ff488a5e.tar.xz tests-351e7f00f0073d825e3faa9216bab230ff488a5e.zip | |
Update test to select xen kernel if needed.
| -rwxr-xr-x | distribution/virt/import/runtest.sh | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/distribution/virt/import/runtest.sh b/distribution/virt/import/runtest.sh index 6872fd1..460280b 100755 --- a/distribution/virt/import/runtest.sh +++ b/distribution/virt/import/runtest.sh @@ -812,8 +812,14 @@ else # this is a xen install perl -pi.bak -e 's/#*\(enable-dump\s+no\)/(enable-dump yes)/g' /etc/xen/xend-config.sxp perl -pi.bak -e 's/^#*XENCONSOLED_LOG_HYPERVISOR=no/XENCONSOLED_LOG_HYPERVISOR=yes/g;s/^#*XENCONSOLED_LOG_GUESTS=no/XENCONSOLED_LOG_GUESTS=yes/g;s/^#*XENCONSOLED_LOG_DIR=.*$/XENCONSOLED_LOG_DIR=\/var\/log\/xen\/console/g' /etc/sysconfig/xend echo "Reboot needed to enable xen logging" - report_result rhts-reboot PASS $REBOOTCOUNT - rhts-reboot + if uname -r | grep -v xen ; then + basekern=$(uname -r) + xenkern=${basekern}"xen" + SelectKernel ${xenkern} + else + report_result rhts-reboot PASS $REBOOTCOUNT + rhts-reboot + fi else echo "Reboot was successful" |