2004-02-18 Yoshinori K. Okuji <okuji@enbug.org>

	From Yury V. Umanets <umka@namesys.com>:
	* stage2/fsys_reiserfs.c (REISER3FS_SUPER_MAGIC_STRING): New
	macro.
	(reiserfs_mount): Added checks for ReiserFS 3.
	(reiserfs_embed): Likewise.

2004-01-25  Yoshinori K. Okuji  <okuji@enbug.org>

	* docs/grub.texi (Obtaining and Building GRUB): Instead of
	describing how to use the anoncvs method, specify the URL of
	the description page on Savannah.
	Reported by Bernhard Treutwein.

diff --git a/ChangeLog b/ChangeLog
index 9df0d426d76e1f951d3991905373e7054542afbe..247a6b8cd5b60fde3718f54918457a56da5d7581 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2004-02-18  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       From Yury V. Umanets <umka@namesys.com>:
+       * stage2/fsys_reiserfs.c (REISER3FS_SUPER_MAGIC_STRING): New
+       macro.
+       (reiserfs_mount): Added checks for ReiserFS 3.
+       (reiserfs_embed): Likewise.
+
+2004-01-25  Yoshinori K. Okuji  <okuji@enbug.org>
+
+       * docs/grub.texi (Obtaining and Building GRUB): Instead of
+       describing how to use the anoncvs method, specify the URL of
+       the description page on Savannah.
+       Reported by Bernhard Treutwein.
+
 2004-01-18  Yoshinori K. Okuji  <okuji@enbug.org>
 
        From Thomas Schwinge <kischde@gmx.net>:

diff --git a/THANKS b/THANKS
index ac35ce1342b0a488319c1fb7a7aabdf9e0bc965a..bd8794a6bd1103f1a1efcdc80cab8b343e34427d 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -109,4 +109,5 @@ Uwe Dannowski <ud3@ira.uka.de>
 VaX#n8 <vax@linkdead.paranoia.com>
 Vesa Jaaskelainen <jaaskela@tietomyrsky.fi>
 Yedidyah Bar-David <didi@post.tau.ac.il>
+Yury V. Umanets <umka@namesys.com>
 Yuri Zaporogets <yuriz@ukr.net>

diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8
index 139a2b27cb97a34c5e6eadd49ae04fe4f16422a1..9c7aa2454ce1ec04d9c3fe68defe41246023df37 100644 (file)
--- a/docs/grub-md5-crypt.8
+++ b/docs/grub-md5-crypt.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-MD5-CRYPT "8" "November 2003" "grub-md5-crypt (GNU GRUB )" FSF
+.TH GRUB-MD5-CRYPT "8" "January 2004" "grub-md5-crypt (GNU GRUB )" FSF
 .SH NAME
 grub-md5-crypt \- Encrypt a password in MD5 format
 .SH SYNOPSIS

diff --git a/docs/grub-terminfo.8 b/docs/grub-terminfo.8
index fe0832bbffc9a91cc003ca7a9426459be1304f65..46f6a306c2f8c2fbb38537c35c7c3cd05c761f4c 100644 (file)
--- a/docs/grub-terminfo.8
+++ b/docs/grub-terminfo.8
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.23.
-.TH GRUB-TERMINFO "8" "November 2003" "grub-terminfo (GNU GRUB 0.94)" FSF
+.TH GRUB-TERMINFO "8" "January 2004" "grub-terminfo (GNU GRUB 0.94)" FSF
 .SH NAME
 grub-terminfo \- Generate a terminfo command from a terminfo name
 .SH SYNOPSIS

diff --git a/docs/grub.8 b/docs/grub.8
index d5d355eff29e250dee19816177f6c67b818f80e2..1a33cb6f964ae57e8be3dfd06710cff316e2121d 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" "January 2004" "grub (GNU GRUB 0.94)" FSF
+.TH GRUB "8" "February 2004" "grub (GNU GRUB 0.94)" FSF
 .SH NAME
 grub \- the grub shell
 .SH SYNOPSIS

diff --git a/docs/grub.texi b/docs/grub.texi
index 7df611067e9696dc71ceb063b52561afaa71d0df..a395feb6228fb2885e26294cbdbab41d8967cdb4 100644 (file)
--- a/docs/grub.texi
+++ b/docs/grub.texi
@@ -3553,23 +3553,8 @@ This will install the grub shell @file{grub} (@pxref{Invoking the grub
 shell}), the Multiboot checker @file{mbchk} (@pxref{Invoking mbchk}),
 and the GRUB images. This will also install the GRUB manual.
 
-Also, the latest version is available from the CVS. The repository is:
-
-@code{:pserver:anoncvs@@subversions.gnu.org:/cvsroot/grub}
-
-and the module is:
-
-@code{grub}
-
-The password for anoncvs is empty. So the instruction is:
-
-@example
-@group
-@kbd{cvs -d :pserver:anoncvs@@subversions.gnu.org:/cvsroot/grub login}
-@kbd{Password: @key{ENTER}}
-@kbd{cvs -d :pserver:anoncvs@@subversions.gnu.org:/cvsroot/grub co grub}
-@end group
-@end example
+Also, the latest version is available from the CVS. See
+@uref{http://savannah.gnu.org/cvs/?group=grub} for more information.
 
 
 @node Reporting bugs

diff --git a/stage2/fsys_reiserfs.c b/stage2/fsys_reiserfs.c
index 28de44bd86d69c861610014f3edd18ac338b4b99..93ec5f85744cba53bd72722c010ccfbd5cfd918f 100644 (file)
--- a/stage2/fsys_reiserfs.c
+++ b/stage2/fsys_reiserfs.c
@@ -77,6 +77,7 @@ struct reiserfs_super_block
 #define REISERFS_MAX_SUPPORTED_VERSION 2
 #define REISERFS_SUPER_MAGIC_STRING "ReIsErFs"
 #define REISER2FS_SUPER_MAGIC_STRING "ReIsEr2Fs"
+#define REISER3FS_SUPER_MAGIC_STRING "ReIsEr3Fs"
 
 #define MAX_HEIGHT 7
 
@@ -573,7 +574,8 @@ reiserfs_mount (void)
   if (part_length < superblock + (sizeof (super) >> SECTOR_BITS)
       || ! devread (superblock, 0, sizeof (struct reiserfs_super_block), 
                (char *) &super)
-      || (substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0
+      || (substring (REISER3FS_SUPER_MAGIC_STRING, super.s_magic) > 0
+         && substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0
          && substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) > 0)
       || (/* check that this is not a copy inside the journal log */
          super.s_journal_block * super.s_blocksize
@@ -586,7 +588,8 @@ reiserfs_mount (void)
                        (char *) &super))
        return 0;
 
-      if (substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0
+      if (substring (REISER3FS_SUPER_MAGIC_STRING, super.s_magic) > 0
+         && substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) > 0
          && substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) > 0)
        {
          /* pre journaling super block ? */
@@ -1220,7 +1223,8 @@ reiserfs_embed (int *start_sector, int needed_sectors)
   
   *start_sector = 1; /* reserve first sector for stage1 */
   if ((substring (REISERFS_SUPER_MAGIC_STRING, super.s_magic) <= 0
-       || substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) <= 0)
+       || substring (REISER2FS_SUPER_MAGIC_STRING, super.s_magic) <= 0
+       || substring (REISER3FS_SUPER_MAGIC_STRING, super.s_magic) <= 0)
       && (/* check that this is not a super block copy inside
           * the journal log */
          super.s_journal_block * super.s_blocksize