From 61a9fc4684d9ab03d319d35e4fdfafa2fa04ad4c Mon Sep 17 00:00:00 2001 From: gord Date: Wed, 3 Nov 1999 17:14:57 +0000 Subject: [PATCH] Merge changes from debian_version_0_5_93. --- ChangeLog | 114 +++++++++++++++++++++++++-------------------- NEWS | 2 +- debian/changelog | 17 +++++-- debian/rules | 7 ++- docs/tutorial.texi | 6 +-- 5 files changed, 82 insertions(+), 64 deletions(-) diff --git a/ChangeLog b/ChangeLog index a78419aa6..feb66434e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,22 @@ +1999-11-03 Gordon Matzigkeit + + * util/mbchk.c (main): Move the version number inside the + parentheses since it is the GRUB package version, not just an + mbchk-specific version. + +1999-10-30 Gordon Matzigkeit + + * debian/rules (binary-arch): Compress man pages. + Strip the grub shell. + Install examples. + 1999-11-03 OKUJI Yoshinori * docs/tutorial.texi: Fix typos by ispell. * docs/user-ref.texi: Likewise. * docs/prog-ref.texi: Likewise. * docs/appendices.texi: Likewise. - + 1999-11-03 OKUJI Yoshinori * stage2/fsys_ext2fs.c (struct ext2_dir_entry): Changed the type @@ -14,14 +26,14 @@ * stage2/builtins.c (device_func) [GRUB_UTIL]: Call nul_terminate before calling check_device. - + 1999-11-02 OKUJI Yoshinori * stage2/disk_io.c (real_open_partition): Check for the right partition for any extended partition as well. Set EXT to I after the check is done. Reported by Jeff Scheinberg . - + * stage2/builtins.c (color_func): Use the function nul_terminate. (device_func) [GRUB_UTIL]: Likewise. @@ -37,14 +49,14 @@ null_terminate. * stage2/char_io.c [!STAGE1_5] (nul_terminate): New function. * stage2/shared.h (nul_terminate): Declared. - + 1999-11-01 OKUJI Yoshinori * docs/grub.texi: Add "I/O ports detection" into the menu. * docs/user-ref.texi: Added a description about the command "ioprobe". * docs/prog-ref.texi (I/O ports detection): New chapter. - + 1999-11-01 OKUJI Yoshinori From Pavel Roskin: @@ -65,7 +77,7 @@ into the device map file even if check_device fails. * stage2/char_io.c [!STAGE1_5] (get_cmdline): Clear ERRNUM after calling print_completions. - + 1999-10-29 OKUJI Yoshinori * stage2/asm.S (track_int13): Defined unconditionally. Do not @@ -87,7 +99,7 @@ * stage2/shared.h (IO_MAP_SIZE): New macro. (track_int13): Declared. (io_map): Likewise. - + 1999-10-29 OKUJI Yoshinori * stage2/char_io.c (print_error) [!STAGE1_5]: Print "Error:" @@ -96,7 +108,7 @@ * stage2/cmdline.c (run_script): If ERRNUM is non-zero, set ERRNUM to ERR_NONE. (enter_cmdline): Clear ERRNUM after print_error. - + 1999-10-28 OKUJI Yoshinori From Pavel Roskin: @@ -124,7 +136,7 @@ [GRUB_UTIL] (DISP_RIGHT): Set to ACS_RARROW. [GRUB_UTIL] (DISP_UP): Set to ACS_UARROW. [GRUB_UTIL] (DISP_DOWN): Set to ACS_DARROW. - + 1999-10-28 OKUJI Yoshinori * stage2/builtins.c (keycode_func): Removed. @@ -148,7 +160,7 @@ * docs/user-ref.texi (General commands): Added a description about the command "setkey". (Stage2 errors): Added a description about ERR_BAD_ARGUMENT. - + 1999-10-27 OKUJI Yoshinori * stage2/disk_io.c (set_device) [!STAGE1_5]: Remove the @@ -159,7 +171,7 @@ * docs/mbchk.1: Regenerated. * docs/grub.8: Likewise. * grub/asmstub.c: Rename KEY_MAP to BIOS_KEY_MAP. - + * stage2/asm.S [!STAGE1_5] (set_int15_handler): Use 0 instead of the maximum number for the segment. [!STAGE1_5] (unset_int15_handler): Likewise. @@ -176,11 +188,11 @@ * stage2/shared.h (KEY_MAP_SIZE): Set to 32. (key_map): Removed. (bios_key_map): Declared. - + 1999-10-26 OKUJI Yoshinori Now the BIOS drive remapping is functional. - + * stage2/asm.S [DEFINE_TRACK_INT13] (track_int13): Use %edi instead of direct addresses. Prefix DATA32 to the calls for real_to_prot and prot_to_real. @@ -199,7 +211,7 @@ (drive_map): 4bytes-aligned. * stage2/disk_io.c (grub_close): Do not set ERRNUM even if FSYS_TYPE is NUM_FSYS. - + 1999-10-25 OKUJI Yoshinori * stage1/stage1.S: Long jump to real_start, because some bogus @@ -207,7 +219,7 @@ (real_start): New label. * docs/Makefile.am (grub.info): Removed. Use the default rule instead. - + 1999-10-25 OKUJI Yoshinori * stage2/asm.S [DEFINE_TRACK_INT13] (int3_handler): Save the @@ -215,30 +227,30 @@ Decrease %bx before restoring the first instruction. [DEFINE_TRACK_INT13] (track_int13): Go to the real mode before setting up the registers for the int13 call. - + 1999-10-24 OKUJI Yoshinori Add the prototype of a function to probe I/O ports used for a BIOS drive. - + * stage2/asm.S [DEFINE_TRACK_INT13] (track_int13): New function. [DEFINE_TRACK_INT13] (int1_handler): New interrupt handler for the real mode. [DEFINE_TRACK_INT13] (int3_handler): Likewise. [DEFINE_TRACK_INT13] (io_map): New variable. - + * stage2/builtins.c (quit_func) [!GRUB_UTIL]: Fix a typo. - + 1999-10-24 OKUJI Yoshinori The new GRUB manual becomes official. - + * docs/grub.texi: Replaced with new-grub.texi. * docs/new-grub.texi: Removed. * docs/Makefile.am (grub_TEXINFOS): New variable. (UNFINISHED_MANUALS): Removed. (EXTRA_DIST): Deleted $(UNFINISHED_MANUALS). - + 1999-10-24 OKUJI Yoshinori * stage2/builtins.c (device_func) [!GRUB_UTIL]: Set ERRNUM to @@ -251,7 +263,7 @@ * docs/user-ref.texi: Fix typos and added some cross-references. * docs/prog-ref.texi: Likewise. * docs/appendices.texi: Likewise. - + 1999-10-23 OKUJI Yoshinori * stage2/builtins.c (map_func): If BIOS_DRIVE_MAP already @@ -262,7 +274,7 @@ instead of @table. (Basic usage): Use @option instead of @code. (Invoking mbchk): Likewise. - + 1999-10-23 OKUJI Yoshinori * stage2/asm.S [!STAGE1_5] (set_int15_handler): New function. @@ -290,7 +302,7 @@ * grub/asmstub.c (set_int15_handler): New function. (unset_int15_handler): Likewise. (key_map): New variable. - + 1999-10-23 OKUJI Yoshinori From Michael Hohmuth : @@ -335,7 +347,7 @@ * stage2/stage2.c (cmain): Clear ERRNUM after calling find_command to just ignore the error code. Call grub_close after loading the configuration file. - + * stage2/asm.S (main): Clean out the bss. 1999-10-23 OKUJI Yoshinori @@ -345,24 +357,24 @@ * docs/tutorial.texi: Likewise. * docs/prog-ref.texi: Likewise. * docs/appendices.texi: Likewise. - + 1999-10-22 OKUJI Yoshinori * docs/prog-ref.texi: New file. * docs/appendices.texi: Likewise. * docs/Makefile.am (UNFINISHED_MANUALS): Added prog-ref.texi and appendices.texi. - + 1999-10-22 OKUJI Yoshinori * docs/user-ref.texi: New file. * docs/Makefile.am (UNFINISHED_MANUALS): Added user-red.texi. - + 1999-10-21 OKUJI Yoshinori Add BIOS drive remapping support for chain-loading some foolish operating systems. - + * stage2/builtins.c (bios_drive_map): New variable. (boot_func): If KERNEL_TYPE is KERNEL_TYPE_CHAINLOADER, check if BIOS_DRIVE_MAP contains meaningful values. If so, search for @@ -381,7 +393,7 @@ * stage2/shared.h (DRIVE_MAP_SIZE): New macro. (set_int13_handler): Declared. * grub/asmstub.c (set_int13_handler): New function. Do nothing. - + 1999-10-20 OKUJI Yoshinori * stage2/builtins.c (find_func): Print only the device names. @@ -390,12 +402,12 @@ (%.c.texi): Use $(SHELL) instead of /bin/sh. (%.h.texi): Likewise. (%.S.texi): Likewise. - + 1999-10-20 OKUJI Yoshinori * stage2/char_io.c (memcheck): Fix the checks: "<=" -> "<". Reported by Mike Hicks . - + 1999-10-19 OKUJI Yoshinori * stage2/builtins.c (find_func): New function. @@ -407,19 +419,19 @@ instead of CURRENT_DRIVE and CURRENT_PARTITION to IMAGE_DRIVE and IMAGE_PARTITION before running install_func. (builtin_table): Added a pointer to BUILTIN_FIND. - + 1999-10-19 OKUJI Yoshinori * docs/Makefile.am (UNFINISHED_MANUALS): New variable. (EXTRA_DIST): Added $(UNFINISHED_MANUALS). * docs/new-grub.texi: New file. - + 1999-10-19 OKUJI Yoshinori * docs/Makefile.am (man_MANS): Added mbchk.1. [MAINTAINER_MODE] (mbchk.1): New target. * docs/mbchk.1: New file. Generated by help2man. - + 1999-10-18 OKUJI Yoshinori * Makefile.am (SUBDIRS): Added util. @@ -427,20 +439,20 @@ * util/Makefile.am: New file. * util/mbchk.c: Likewise. * util/Makefile.in: Likewise. Generated by automake. - + 1999-10-17 OKUJI Yoshinori * docs/Makefile.am (.texi): Canceled because the dependecies can be circulated. * stage2/builtins.c (embed_func): Set BUF_TRACK to -1 before writing the Stage 1.5 to the disk to clear the cache. - + 1999-10-17 OKUJI Yoshinori * stage2/boot.c (load_initrd): Change types of *RAMDISK and MOVETO to unsigned long. Apply the macro RAW_ADDR to MOVETO. - + 1999-10-16 OKUJI Yoshinori * docs/multiboot.texi: Include the example source files of a @@ -460,7 +472,7 @@ (%.c.texi): New target. (%.h.texi): Likewise. (%.S.texi): Likewise. - + 1999-09-22 OKUJI Yoshinori * multiboot.texi (BIOS device mapping techniques): New section. @@ -468,7 +480,7 @@ (Data comparison technique): New subsection. (I/O restriction technique): Likewise. (Example OS code): Rewrited from scratch. - + 1999-09-21 OKUJI Yoshinori * multiboot.texi: Rename Multiboot Standard to Multiboot @@ -486,7 +498,7 @@ If installing the Stage 1 into a MBR, embed the Stage 1.5 in the sectors right after it. Return the result of install_func instead of zero. - + 1999-10-14 Pavel Roskin * configure.in: Check for opendisk in libutil. @@ -521,7 +533,7 @@ string of OPTARG. * stage2/shared.h [GRUB_UTIL] (device_map_file): Declared. * docs/grub.8: Regenerated. - + 1999-10-13 OKUJI Yoshinori * stage2/builtins.c (color_func): Do not set NORMAL_COLOR or @@ -536,7 +548,7 @@ * docs/grub.texi (Commands): Adjusted to the long doc of BUILTIN_COLOR. * docs/menu.lst: Add examples of "fallback" and "color". - + 1999-10-13 OKUJI Yoshinori * stage2/char_io.c [!STAGE1_5] (get_cmdline): If C is a newline @@ -550,10 +562,10 @@ (builtin_table): Added a pointer to BUILTIN_EMBED and a pointer to BUILTIN_SETUP. * stage2/shared.h (grub_strncat): Declared. - + * stage2/Makefile.am (stage2_size.h): ../stage2/stage2 -> pre_stage2. Reported by Pavel Roskin. - + 1999-10-12 OKUJI Yoshinori From Pavel Roskin: @@ -573,11 +585,11 @@ (STAGE1_STAGE2_ADDRESS): 0x44 -> 0x45. (STAGE1_STAGE2_SEGMENT): 0x46 -> 0x47. (STAGE1_BOOT_DRIVE): 0x3f -> 0x40. - + 1999-10-09 OKUJI Yoshinori Stage1 supports both the CHS mode and the LBA mode. - + * stage1/Makefile.am (nodist_pkgdata_DATA): Removed stage1_lba. (BUILT_SOURCES): Deleted. (CLEANFILES): Likewise. @@ -640,7 +652,7 @@ * stage2/shared.h (BOOTSEC_LISTSIZE): New macro. * stage2/stage1_5.c: Change the second argument for chain_stage2 to 0x8200. - + 1999-10-08 OKUJI Yoshinori * configure.in (--with-binutils): New option to specify a @@ -655,19 +667,19 @@ (grub_ASM_ADDR32): Likewise. (grub_ASM_PREFIX_REQUIREMENT): Likewise. (grub_PROG_OBJCOPY_ABSOLUTE): Use CC instead of LD. - + 1999-10-04 Pavel Roskin * stage2/freebsd.h (struct bootinfo): New member, bi_bios_dev. * stage2/boot.c (bsd_boot): Set BI.BI_BIOS_DEV to SAVED_DRIVE. - + 1999-10-04 OKUJI Yoshinori From Pavel Roskin: * docs/grub.texi: Fix typos. * stage2/builtins.c (install_func): Reformat the warning message about the option `d'. - + 1999-10-03 Gordon Matzigkeit * stage2/builtins.c (install_func): Fix check for the Stage 2 id. diff --git a/NEWS b/NEWS index 77048b60e..3f75436f9 100644 --- a/NEWS +++ b/NEWS @@ -27,7 +27,7 @@ New in 0.5.94: * The command "install" can now patch a Stage 2 with a different filename from "/boot/grub/menu.lst" even if a Stage 1.5 is used. -New in 0.5.93: +New in 0.5.93 - 1999-10-30: * ELF format of FreeBSD kernel is supported. * Support the partition ids for NetBSD and OpenBSD. * Exit from the grub shell just by pushing the key `q' in the menu. diff --git a/debian/changelog b/debian/changelog index 2b5417289..7004fcb4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,11 +2,18 @@ grub (0.5.94) unstable; urgency=low grub (0.5.93) unstable; urgency=low - * Updated example configurations. (fixes:bug#42136) - * Highlight color set correctly when editing. (fixes:bug#42549) - * dpkg-shlibdeps called on /usr/sbin/grub. (fixes:bug#42704) - * Properly install Texinfo documentation. (fixes:bug#42705,bug#42919) - * Update file locations in README.Debian. (fixes:bug#42834) + * Updated example configurations. (closes:bug#42136) + * Highlight color set correctly when editing. (closes:bug#42549) + * dpkg-shlibdeps called on /usr/sbin/grub. (closes:bug#42704) + * Properly install Texinfo documentation. (closes:bug#42705,bug#42919) + (closes:bug#43080,bug#45150) + * Update file locations in README.debian. (closes:bug#42834) + * Upstream fixes for new binutils assembler syntax. (closes:bug#47946) + * FAT32 support. (closes:bug#47970) + * Password option fixed. (closes:bug#43798) + * Sample menu.lst included in doc directory. (closes:bug#47181) + + -- Gordon Matzigkeit Sat, 30 Oct 1999 09:59:09 -0600 grub (0.5.92) unstable; urgency=low diff --git a/debian/rules b/debian/rules index 0b37573e5..5915a4d4c 100644 --- a/debian/rules +++ b/debian/rules @@ -35,11 +35,10 @@ binary-arch: checkroot build ## install files dir=`cd debian/tmp && pwd` && make install DESTDIR=$$dir - gzip -f9 debian/tmp/usr/info/* + gzip -f9 debian/tmp/usr/info/* debian/tmp/usr/man/man8/* + strip -s debian/tmp/usr/sbin/* - $(INSTALL_DATA) TODO debian/tmp/usr/doc/grub/ - $(INSTALL_DATA) BUGS debian/tmp/usr/doc/grub/ - $(INSTALL_DATA) NEWS debian/tmp/usr/doc/grub/ + $(INSTALL_DATA) TODO BUGS NEWS docs/menu.lst debian/tmp/usr/doc/grub/ $(INSTALL_DATA) ChangeLog debian/tmp/usr/doc/grub/changelog gzip -f9 debian/tmp/usr/doc/grub/changelog diff --git a/docs/tutorial.texi b/docs/tutorial.texi index 93a9db792..1079f23c8 100644 --- a/docs/tutorial.texi +++ b/docs/tutorial.texi @@ -49,7 +49,7 @@ that you can specify a drive/partition. See this example: This means the first floppy disk drive. GRUB requires that the device name is enclosed with @samp{(} and @samp{)}. The number @samp{0} is the drive number, which is counted from @emph{zero}. In this case, GRUB uses -the whole of the floppy disk. +the whole floppy disk. @example (hd0,1) @@ -60,7 +60,7 @@ integer @samp{0} indicates the drive number, that is, the first hard disk, while the second integer @samp{1} indicates the partition number (or the @sc{pc} slice number in the BSD terminology). Note that the partition numbers are counted from @emph{zero} but not from one. In this -case, GRUB uses the partition of the disk instead of the whole of the +case, GRUB uses the partition of the disk instead of the whole disk. @example @@ -101,7 +101,7 @@ Now the question is how to specify a file. Again, see this example: This specifies the file whose name is @samp{vmlinuz} on the first partition of the first hard disk drive. Isn't that easy? All you should do is type the absolute filename. If you are tired of typing the -whole of the filename, press the @key{TAB} key. @kbd{@key{TAB}} +whole filename, press the @key{TAB} key. @kbd{@key{TAB}} completes the filename if it is unique. Otherwise, it displays the list of the candidates.