vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
on primary master on pseries.
This commit is contained in:
Vladimir Serbinenko 2013-11-18 14:40:41 +01:00
parent ea7c1a7d90
commit 35c2851cc1
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> 2013-11-18 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/tests/videotest_checksum.c: Don't reload unifont if it's * grub-core/tests/videotest_checksum.c: Don't reload unifont if it's

3
tests/util/grub-shell.in
View file

@ -211,6 +211,7 @@ for option in "$@"; do
serial_null= serial_null=
qemuopts="$qemuopts -M pseries -no-reboot" qemuopts="$qemuopts -M pseries -no-reboot"
trim=1 trim=1
pseries=y
;; ;;
--qemu-opts=*) --qemu-opts=*)
qs=`echo "$option" | sed -e 's/--qemu-opts=//'` qs=`echo "$option" | sed -e 's/--qemu-opts=//'`
@ -361,7 +362,7 @@ if [ x$boot = xhd ]; then
bootdev="-boot c" bootdev="-boot c"
fi fi
if [ x$boot = xcd ]; then 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=" device="-drive if=ide,media=cdrom,file="
else else
device="cdrom " device="cdrom "