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

2007-07-22 Robert Millan <rmh@aybabtu.com>

Browse source 
* include/grub/ieee1275/ieee1275.h (grub_ieee1275_flag): Add
	GRUB_IEEE1275_FLAG_BROKEN_OUTPUT flag.
	* kern/powerpc/ieee1275/cmain.c (grub_ieee1275_find_options): Set this
	flag when running on SmartFirmware.
	* term/ieee1275/ofconsole.c (grub_ofconsole_init): Avoid running
	"output-device output" command when GRUB_IEEE1275_FLAG_BROKEN_OUTPUT
	was set.

	* kern/powerpc/ieee1275/openfw.c (grub_ieee1275_encode_devname):
	Increase partno when GRUB_IEEE1275_FLAG_0_BASED_PARTITIONS flag is set,
	rather than decreasing it.

	* util/i386/pc/grub-setup.c (setup): When embedding is required, but
	there's not enough space to do it, fail in the same way as when it
	can't be done because there are no partitions.

	* util/powerpc/ieee1275/grub-install.in: Improve error message shown
	when nvsetenv failed.
This commit is contained in:
robertmh 2007-07-22 09:05:11 +00:00
parent 969c02ec31
commit ad0686cc6d
7 changed files with 44 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
term/ieee1275/ofconsole.c
View file

@ -311,8 +311,10 @@ grub_ofconsole_init (void)
int col;
/* The latest PowerMacs don't actually initialize the screen for us, so we
* use this trick to re-open the output device. */
grub_ieee1275_interpret ("output-device output", 0);
* use this trick to re-open the output device (but we avoid doing this on
* platforms where it's known to be broken). */
if (! grub_ieee1275_test_flag (GRUB_IEEE1275_FLAG_BROKEN_OUTPUT))
grub_ieee1275_interpret ("output-device output", 0);
if (grub_ieee1275_get_property (grub_ieee1275_chosen, "stdout", data,
sizeof data, &actual)