diff --git a/ChangeLog b/ChangeLog index aad64adb6..52c436de6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2000-10-14 OKUJI Yoshinori + + * docs/tutorial.texi (Serial terminal): Fixed a typo. + * docs/user-ref.texi (GRUB images): New chapter. + * docs/grub.texi: Added an entry for the chapter "GRUB images". + 2000-10-14 OKUJI Yoshinori * stage2/builtins.c (setkey_func): If TO_KEY is NULL (i.e. the diff --git a/NEWS b/NEWS index 4de46a8cb..8cb3b5fe5 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,9 @@ NEWS - list of user-visible changes between releases of GRUB +New in 1.0 - XXXX-XX-XX: +* The command "setkey" resets key mappings, when no argument is + specified. + New in 0.5.96 - 2000-10-04: * New commands, "reboot" and "halt". * New command, "hiddenmenu". You can hide the menu interface by default diff --git a/TODO b/TODO index 20d157463..db407689d 100644 --- a/TODO +++ b/TODO @@ -74,8 +74,6 @@ Priorities: * Add internationalization support, emulating gettext as much as is feasible. -? Add command for modifying partition types. - * Add CDROM-chainloading support. It would be enough to support only BIOSes which have bootable-CDROM support (so you may use the "Bootable CDROM" BIOS calls). It is not trivial to support BIOSes without the diff --git a/docs/grub.texi b/docs/grub.texi index feda93845..cf077a289 100644 --- a/docs/grub.texi +++ b/docs/grub.texi @@ -106,6 +106,7 @@ Part I: The Tutorial Manual Part II: The User Reference Manual * Introduction:: Capturing the spirit of GRUB +* GRUB images:: GRUB images * Filesystem:: Filesystem syntax and semantics * Interface:: The menu and the command-line * Commands:: The list of available builtin commands diff --git a/docs/stamp-vti b/docs/stamp-vti index 2edbe2ead..f31a10271 100644 --- a/docs/stamp-vti +++ b/docs/stamp-vti @@ -1,3 +1,3 @@ -@set UPDATED 13 October 2000 +@set UPDATED 14 October 2000 @set EDITION 0.5.97 @set VERSION 0.5.97 diff --git a/docs/tutorial.texi b/docs/tutorial.texi index 430a50756..9f0ef6bf9 100644 --- a/docs/tutorial.texi +++ b/docs/tutorial.texi @@ -952,7 +952,7 @@ However, note that GRUB assumes that your terminal emulator is compatible with VT100 by default. This is true for most terminal emulators nowadays, but you should pass the option @option{--dumb} to the command, if your terminal emulator is not VT100-compatible or -implement few VT100 escape sequences. If you specify the option, then +implements few VT100 escape sequences. If you specify the option, then GRUB doesn't provide you with the menu interface, because the menu requires several fancy features for your terminal. Instead, GRUB only gives you the hidden menu interface and the command-line interface. diff --git a/docs/user-ref.texi b/docs/user-ref.texi index a0be73bfd..c2b00f9ab 100644 --- a/docs/user-ref.texi +++ b/docs/user-ref.texi @@ -197,6 +197,60 @@ recognition. We hope that you enjoy using GNU GRUB as much as we did writing it. +@node GRUB images +@chapter GRUB images + +GRUB consists of several images: two essential stages, optional stages +called @dfn{Stage 1.5}, and two network boot images. Here is a short +overview of them. See @ref{Hacking}, for more details. + +@table @file +@item stage1 +This is an essential image used for booting up GRUB. Usually, this is +embedded in a MBR or the boot sector of a partition. Because a PC boot +sector is 512 bytes, the size of this image is exactly 512 bytes. + +All @file{stage1} must do is to load Stage 2 or Stage 1.5 from a local +disk. Because of the size restriction, @file{stage1} encodes the +location of Stage 2 (or Stage 1.5) in a block list format, so it never +understand any filesystem structure. + +@item stage2 +This is the core image of GRUB. This does all things but booting up +itself. Usually, this is put in a filesystem, but that is not required. + +@item e2fs_stage1_5 +@itemx ffs_stage1_5 +@itemx reiserfs_stage1_5 +@itemx fat_stage1_5 +@itemx minix_stage1_5 + +These are called @dfn{Stage 1.5}, because the purpose is a bridge +between @file{stage1} and @file{stage2}, that is to say, Stage 1.5 is +loaded by Stage 1 and Stage 1.5 loads Stage 2. The difference between +@file{stage1} and @file{*_stage1_5} is that the former doesn't +understand any filesystem but the latter does an filesystem +(e.g. @file{e2fs_stage1_5} understands ext2fs). So you can move the +location of Stage 2 to another safely, even after GRUB has been +installed. + +While Stage 2 cannot generally be embedded in a fixed area as the size +is so large, Stage 1.5 can be installed into the area right after a MBR, +or the boot loader area of a ReiserFS or a FFS. + +@item nbgrub +This is a network boot image for the Network Image Proposal used by some +network boot loaders, such as Etherboot. This is mostly the same as +Stage 2, but this also sets up a network and loads a configuration file +from the network. + +@item pxegrub +This is another network boot image for the Preboot Execution Environment +used by several Netboot ROMs. This is identical to @file{nbgrub}, except +for the format. +@end table + + @node Filesystem @chapter Filesystem syntax and semantics diff --git a/docs/version.texi b/docs/version.texi index 2edbe2ead..f31a10271 100644 --- a/docs/version.texi +++ b/docs/version.texi @@ -1,3 +1,3 @@ -@set UPDATED 13 October 2000 +@set UPDATED 14 October 2000 @set EDITION 0.5.97 @set VERSION 0.5.97