tests/util/grub-shell: Allow explicitly using other serial ports for output

While here, move "-qemu=*" case to be next to the "--qemu-opts=*" case.
This causes no change in logic, but is more logically located.

Signed-off-by: Glenn Washburn <development@efficientek.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>

diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 29c7e936e740ae1d72a7b13a56e1a468ef9948bc..715e1c2e67b3db4645268c7fcb5d5dd8b6e87e88 100644 (file)
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -259,8 +259,6 @@ for option in "$@"; do
     --mkrescue-arg=*)
        mkr=`echo "$option" | sed -e 's/--mkrescue-arg=//' -e 's/,/ /g'`
        mkrescue_args="$mkrescue_args $mkr" ;;
-    --qemu=*)
-       qemu=`echo "$option" | sed -e 's/--qemu=//' -e 's/,/ /g'`;;
     --pseries)
        qemu=qemu-system-ppc64
        serial_port=ieee1275/hvterm
@@ -269,6 +267,10 @@ for option in "$@"; do
        trim=1
        pseries=y
            ;;
+    --serial=*)
+       serial_port=`echo "$option" | sed -e 's/--serial=//'`;;
+    --qemu=*)
+       qemu=`echo "$option" | sed -e 's/--qemu=//' -e 's/,/ /g'`;;
     --qemu-opts=*)
        qs=`echo "$option" | sed -e 's/--qemu-opts=//'`
        qemuopts="$qemuopts $qs" ;;