From 54566a13aee3da78f7059af347e17322b6f07e5a Mon Sep 17 00:00:00 2001 From: okuji Date: Wed, 18 Feb 2004 22:10:00 +0000 Subject: [PATCH] 2004-02-18 Yoshinori K. Okuji From Yury V. Umanets : * 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 * 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. --- ChangeLog | 15 +++++++++++++++ THANKS | 1 + docs/grub-md5-crypt.8 | 2 +- docs/grub-terminfo.8 | 2 +- docs/grub.8 | 2 +- docs/grub.texi | 19 ++----------------- stage2/fsys_reiserfs.c | 10 +++++++--- 7 files changed, 28 insertions(+), 23 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9df0d426d..247a6b8cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2004-02-18 Yoshinori K. Okuji + + From Yury V. Umanets : + * 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 + + * 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 From Thomas Schwinge : diff --git a/THANKS b/THANKS index ac35ce134..bd8794a6b 100644 --- a/THANKS +++ b/THANKS @@ -109,4 +109,5 @@ Uwe Dannowski VaX#n8 Vesa Jaaskelainen Yedidyah Bar-David +Yury V. Umanets Yuri Zaporogets diff --git a/docs/grub-md5-crypt.8 b/docs/grub-md5-crypt.8 index 139a2b27c..9c7aa2454 100644 --- 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 fe0832bbf..46f6a306c 100644 --- 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 d5d355eff..1a33cb6f9 100644 --- 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 7df611067..a395feb62 100644 --- 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 28de44bd8..93ec5f857 100644 --- 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