2004-07-24 Yoshinori K. Okuji <okuji@enbug.org>

	* stage2/stage2.c (cmain): Terminate DEFAULT_FILE with NUL
	correctly. Reported by Alban Crequy <alban.crequy@apinc.org>.

diff --git a/ChangeLog b/ChangeLog
index 9c283c137969b1f31f1f00182c1efbf7da090e58..d4c3d6a0d51ad103af6f2ff2f1ea14325b8114f8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-07-24  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * stage2/stage2.c (cmain): Terminate DEFAULT_FILE with NUL
+       correctly. Reported by Alban Crequy <alban.crequy@apinc.org>.
+
 2004-07-21  Robert Millan  <robertmh@gnu.org>
 
        Patch from David Weinehall <tao@debian.org>

diff --git a/THANKS b/THANKS
index c008e0b0c855bf4286e1064a453d46cd542eec75..908cb912169d137b7029cd3409b284fd6609d060 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -8,6 +8,7 @@ generally assist in the GRUB maintainership process:
 
 Adam Lackorzynski <adam@os.inf.tu-dresden.de>
 Adrian Phillips <a.phillips@dnmi.no>
+Alban Crequy <alban.crequy@apinc.org>
 Alessandro Rubini <rubini@gnu.org>
 Alexander K. Hudek <alexhudek@home.com>
 Alexander Langer <alex@big.endian.de>

diff --git a/docs/grub-install.8 b/docs/grub-install.8
index 88e74a0ccad46065890aeec2c4a352f607692a69..56411b62514f007dde50d61afaa08526d1db91c2 100644 (file)
--- a/docs/grub-install.8
+++ b/docs/grub-install.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-INSTALL "8" "June 2004" "grub-install (GNU GRUB 0.95)" FSF
+.TH GRUB-INSTALL "8" "July 2004" "grub-install (GNU GRUB 0.95)" FSF
 .SH NAME
 grub-install \- install GRUB on your drive
 .SH SYNOPSIS
@@ -32,6 +32,10 @@ BIOS
 probe a device map even if it already exists
 .PP
 INSTALL_DEVICE can be a GRUB device name or a system device filename.
+.PP
+grub-install copies GRUB images into the DIR/boot directory specfied by
+\fB\-\-root\-directory\fR, and uses the grub shell to install grub into the boot
+sector.
 .SH "REPORTING BUGS"
 Report bugs to <bug-grub@gnu.org>.
 .SH "SEE ALSO"

diff --git a/docs/grub.8 b/docs/grub.8
index 152e8002e194d52f5562c6d232607fb1f63c2c8b..fbb71b697276a5e599281c7319ff50ac2090d0ac 100644 (file)
--- a/docs/grub.8
+++ b/docs/grub.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB "8" "June 2004" "grub (GNU GRUB 0.95)" FSF
+.TH GRUB "8" "July 2004" "grub (GNU GRUB 0.95)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS

diff --git a/docs/stamp-vti b/docs/stamp-vti
index 43a51afc856d77e3d0c5556f7ed509fb9a7e410d..49a3dafa9515abc8543df3245c7451553056598b 100644 (file)
--- a/docs/stamp-vti
+++ b/docs/stamp-vti
@@ -1,4 +1,4 @@
-@set UPDATED 20 June 2004
-@set UPDATED-MONTH June 2004
+@set UPDATED 16 July 2004
+@set UPDATED-MONTH July 2004
 @set EDITION 0.95
 @set VERSION 0.95

diff --git a/docs/version.texi b/docs/version.texi
index 43a51afc856d77e3d0c5556f7ed509fb9a7e410d..49a3dafa9515abc8543df3245c7451553056598b 100644 (file)
--- a/docs/version.texi
+++ b/docs/version.texi
@@ -1,4 +1,4 @@
-@set UPDATED 20 June 2004
-@set UPDATED-MONTH June 2004
+@set UPDATED 16 July 2004
+@set UPDATED-MONTH July 2004
 @set EDITION 0.95
 @set VERSION 0.95

diff --git a/stage2/stage2.c b/stage2/stage2.c
index f5982b6ff84d1cc9db4e737233351ee3b8a71647..96e18cd324b20466cf58e492a66c14e3aca3a363 100644 (file)
--- a/stage2/stage2.c
+++ b/stage2/stage2.c
@@ -879,6 +879,7 @@ cmain (void)
                i++;
                break;
              }
+         default_file[i] = 0;
          grub_strncat (default_file + i, "default", DEFAULT_FILE_BUFLEN - i);
          if (grub_open (default_file))
            {