* tests/util/grub-shell.in: Use -cdrom and don't force cdrom

	on primary master on pseries.

diff --git a/ChangeLog b/ChangeLog
index b38485d0b6dbfdcf3d5937eff151f9e583b6a764..959db45df41999a70f425231950d9c365790864a 100644 (file)
--- 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 0abdf1794766db65e9b7c6b915ab1fc921d65d29..b0081cb7fbe20b7b8fbe3d782e57290664d9be00 100644 (file)
--- 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 "