summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Peck <bpeck@redhat.com>2014-11-25 15:24:57 -0500
committerBill Peck <bpeck@redhat.com>2014-11-25 15:24:57 -0500
commit5a79fcdedac62758e52ed3b4757aba3c85ae4ead (patch)
treed524bb053f0b339fdc7f90f0e59ab4764852cab6
parent3413fcbd6f504266f70335f74c05386a14f500f5 (diff)
downloadtests-5a79fcdedac62758e52ed3b4757aba3c85ae4ead.tar.gz
tests-5a79fcdedac62758e52ed3b4757aba3c85ae4ead.tar.xz
tests-5a79fcdedac62758e52ed3b4757aba3c85ae4ead.zip
Final fix
-rwxr-xr-xkernel/kernelinstall/runtest.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/kernelinstall/runtest.sh b/kernel/kernelinstall/runtest.sh
index f2c986f..215a402 100755
--- a/kernel/kernelinstall/runtest.sh
+++ b/kernel/kernelinstall/runtest.sh
@@ -397,8 +397,8 @@ function update_console ()
console=$(awk '/console=ttyS/{for(i=1;i<=NF;++i)if($i~/console=ttyS[^ ]*/)print $i; exit}' /etc/grub.conf)
# Find our defult kernel
default_kernel=$(grubby --default-kernel)
- # Get the serial settings
- settings=$(echo $console | awk -F, '{ print $2 }' | sed -e 's/\([0-9]*\)\(.*\)/\1,\2/; s/n81/8n1/')
+ # Get the serial settings and order them for XEN
+ settings=$(echo $console |perl -pe 's/.*,([0-9]+)([neo])?([5678])?/$1,$3$2/')
DeBug $console
if echo $console | grep -q ttyS0 ; then