From 35c2851cc117ac07076b513a5936fe514d4fe154 Mon Sep 17 00:00:00 2001
From: Vladimir Serbinenko <phcoder@gmail.com>
Date: Mon, 18 Nov 2013 14:40:41 +0100
Subject: [PATCH] 	* tests/util/grub-shell.in: Use -cdrom and don't force
 cdrom 	on primary master on pseries.

---
 ChangeLog                | 5 +++++
 tests/util/grub-shell.in | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index b38485d0b..959db45df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* tests/util/grub-shell.in: Use -cdrom and don't force cdrom
+	on primary master on pseries.
+
 2013-11-18  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/tests/videotest_checksum.c: Don't reload unifont if it's
diff --git a/tests/util/grub-shell.in b/tests/util/grub-shell.in
index 0abdf1794..b0081cb7f 100644
--- a/tests/util/grub-shell.in
+++ b/tests/util/grub-shell.in
@@ -211,6 +211,7 @@ for option in "$@"; do
 	serial_null=
 	qemuopts="$qemuopts -M pseries -no-reboot"
 	trim=1
+	pseries=y
 	    ;;
     --qemu-opts=*)
         qs=`echo "$option" | sed -e 's/--qemu-opts=//'`
@@ -361,7 +362,7 @@ if [ x$boot = xhd ]; then
     bootdev="-boot c"
 fi
 if [ x$boot = xcd ]; then
-    if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ]; then
+    if [ "${grub_modinfo_target_cpu}-${grub_modinfo_platform}" = powerpc-ieee1275 ] && [ x$pseries != xy ] ; then
 	device="-drive if=ide,media=cdrom,file="
     else
 	device="cdrom "