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

Merge mainline into plan9

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-11-13 12:48:39 +01:00
commit 4e01c8c165
595 changed files with 52570 additions and 11831 deletions
Download patch file Download diff file Expand all files Collapse all files

6
grub-core/loader/i386/pc/plan9.c
View file

@ -47,7 +47,8 @@ static grub_uint32_t eip = 0xffffffff;
static const struct grub_arg_option options[] =
{
{"map", 'm', GRUB_ARG_OPTION_REPEATABLE,
N_("Override guessed mapping of Plan9 devices."), "GRUBDEVICE=PLAN9DEVICE",
N_("Override guessed mapping of Plan9 devices."),
N_("GRUBDEVICE=PLAN9DEVICE"),
ARG_TYPE_STRING},
{0, 0, 0, 0, 0, 0}
};
@ -77,7 +78,8 @@ grub_plan9_boot (void)
.edi = 0,
.esp = 0,
.ebp = 0,
.esi = 0
.esi = 0,
.a20 = 1
};
grub_video_set_mode ("text", 0, 0);