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

fix the interpretation of the boot drive in the multiboot.

Browse source
This commit is contained in:
okuji 1999-09-13 03:43:20 +00:00
parent e7e309350c
commit 5ef3bd9c37
3 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
1999-09-12 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* stage2/boot.c (load_image): Use CURRENT_DRIVE and
CURRENT_PARTITION instead of SAVED_DRIVE and SAVED_PARTITION for
the boot device in the Multiboot information. Reported by
Stephen Early <steve@greenend.org.uk>.
1999-09-12 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp> 1999-09-12 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
* stage2/disk_io.c (sane_partition) [STAGE1_5]: Defined. * stage2/disk_io.c (sane_partition) [STAGE1_5]: Defined.

1
THANKS
View file

@ -24,5 +24,6 @@ OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
Pavel Roskin <pavel_roskin@geocities.com> Pavel Roskin <pavel_roskin@geocities.com>
Peter Astrand <altic@lysator.liu.se> Peter Astrand <altic@lysator.liu.se>
Ramon van Handel <vhandel@chem.vu.nl> Ramon van Handel <vhandel@chem.vu.nl>
Stephen Early <steve@greenend.org.uk>
Takehiro Suzuki <takehiro@coral.ocn.ne.jp> Takehiro Suzuki <takehiro@coral.ocn.ne.jp>
VaX#n8 <vax@linkdead.paranoia.com> VaX#n8 <vax@linkdead.paranoia.com>

2
stage2/boot.c
View file

@ -295,7 +295,7 @@ load_image (char *kernel, char *arg)
mbi.cmdline = (int) arg; mbi.cmdline = (int) arg;
mbi.mods_count = 0; mbi.mods_count = 0;
mbi.mods_addr = 0; mbi.mods_addr = 0;
mbi.boot_device = (saved_drive << 24) | saved_partition; mbi.boot_device = (current_drive << 24) | current_partition;
mbi.flags &= ~(MB_INFO_MODS | MB_INFO_AOUT_SYMS | MB_INFO_ELF_SHDR); mbi.flags &= ~(MB_INFO_MODS | MB_INFO_AOUT_SYMS | MB_INFO_ELF_SHDR);
mbi.syms.a.tabsize = 0; mbi.syms.a.tabsize = 0;
mbi.syms.a.strsize = 0; mbi.syms.a.strsize = 0;