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

2002-05-24 Yoshinori K. Okuji <okuji@enbug.org>

Browse source 
* stage2/builtins.c (real_root_func): New function.
	(root_func): Just call real_root_func.
	(rootnoverify_func): Likewise.
This commit is contained in:
okuji 2002-05-24 13:53:57 +00:00
parent 58a5878421
commit 4339b22d7a
2 changed files with 22 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2002-05-24 Yoshinori K. Okuji <okuji@enbug.org>
* stage2/builtins.c (real_root_func): New function.
(root_func): Just call real_root_func.
(rootnoverify_func): Likewise.
2002-05-23 Yoshinori K. Okuji <okuji@enbug.org> 2002-05-23 Yoshinori K. Okuji <okuji@enbug.org>
* configure.in (AM_INIT_AUTOMAKE): Changed the version number to * configure.in (AM_INIT_AUTOMAKE): Changed the version number to

35
stage2/builtins.c
View file

@ -3099,9 +3099,9 @@ print_root_device (void)
current_drive = saved_drive; current_drive = saved_drive;
print_fsys_type (); print_fsys_type ();
} }
static int static int
root_func (char *arg, int flags) real_root_func (char *arg, int attempt_mount)
{ {
int hdbias = 0; int hdbias = 0;
char *biasptr; char *biasptr;
@ -3120,8 +3120,11 @@ root_func (char *arg, int flags)
return 1; return 1;
/* Ignore ERR_FSYS_MOUNT. */ /* Ignore ERR_FSYS_MOUNT. */
if (! open_device () && errnum != ERR_FSYS_MOUNT) if (attempt_mount)
return 1; {
if (! open_device () && errnum != ERR_FSYS_MOUNT)
return 1;
}
/* Clear ERRNUM. */ /* Clear ERRNUM. */
errnum = 0; errnum = 0;
@ -3135,11 +3138,18 @@ root_func (char *arg, int flags)
bootdev = set_bootdev (hdbias); bootdev = set_bootdev (hdbias);
/* Print the type of the filesystem. */ /* Print the type of the filesystem. */
print_fsys_type (); if (attempt_mount)
print_fsys_type ();
return 0; return 0;
} }
static int
root_func (char *arg, int flags)
{
return real_root_func (arg, 1);
}
static struct builtin builtin_root = static struct builtin builtin_root =
{ {
"root", "root",
@ -3163,20 +3173,7 @@ static struct builtin builtin_root =
static int static int
rootnoverify_func (char *arg, int flags) rootnoverify_func (char *arg, int flags)
{ {
/* If ARG is empty, just print the current root device. */ return real_root_func (arg, 0);
if (! *arg)
{
print_root_device ();
return 0;
}
if (! set_device (arg))
return 1;
saved_partition = current_partition;
saved_drive = current_drive;
current_drive = -1;
return 0;
} }
static struct builtin builtin_rootnoverify = static struct builtin builtin_rootnoverify =