vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

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

Browse source 
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.
This commit is contained in:
okuji 2004-02-18 22:10:00 +00:00
parent 36caa9beb0
commit 54566a13ae
7 changed files with 28 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
ChangeLog
View file

@ -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>:

1
THANKS
View file

@ -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>

2
docs/grub-md5-crypt.8
View file

@ -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

2
docs/grub-terminfo.8
View file

@ -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

2
docs/grub.8
View file

@ -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

19
docs/grub.texi
View file

@ -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

10
stage2/fsys_reiserfs.c
View file

@ -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