add a new command device. now the command geometry can modify geometries of any disks.
This commit is contained in:
okuji
parent
99c588976f
commit
95a60f61ce
5 changed files with 155 additions and 41 deletions
11
ChangeLog
11
ChangeLog
|
|
@ -1,3 +1,14 @@
|
|||
1999-09-10 OKUJI Yoshinori <okuji@kuicr.kyoto-u.ac.jp>
|
||||
|
||||
* stage2/builtins.c (device_func): New function.
|
||||
(builtin_device): New variable.
|
||||
(builtin_table): Added the pointer to BUILTIN_DEVICE.
|
||||
(builtin_geometry) [GRUB_UTIL]: Accept extra arguments,
|
||||
CYLINDER, HEAD, SECTOR and TOTAL_SECTOR, and, if they are found,
|
||||
set the geometry of a drive specified to them.
|
||||
* grub/asmstub.c (disks): Made global.
|
||||
(assign_device_name): New function.
|
||||
|
||||
1999-09-09 Gordon Matzigkeit <gord@fig.org>
|
||||
|
||||
* docs/grub.texi (Commands): Synchronize descriptions with
|
||||
|
|
|
|||
6
NEWS
6
NEWS
|
|
@ -12,8 +12,12 @@ New in 0.5.93:
|
|||
is supported for backward compatibility.
|
||||
* The command "help" displays helpful information about builtin
|
||||
commands.
|
||||
* The command "geometry" displays the information of a drive specified.
|
||||
* The command "geometry" displays the information of a drive specified
|
||||
and set the geometry to arbitrary C/H/S values if the optional
|
||||
arguments are used.
|
||||
* The command "configfile" loads a configuration file interactively.
|
||||
* The command "device" assigns a BIOS drive to an arbitrary filename in
|
||||
the grub shell.
|
||||
|
||||
New in 0.5.92 - 1999-07-26:
|
||||
* Bug fixes (i.e. Stage 1.5 can work fine again).
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@ char config_file[128] = "/boot/grub/menu.lst"; /* FIXME: arbitrary */
|
|||
char *grub_scratch_mem = 0;
|
||||
|
||||
#define NUM_DISKS 256
|
||||
static struct geometry *disks = 0;
|
||||
struct geometry *disks = 0;
|
||||
|
||||
/* The map between BIOS drives and UNIX device file names. */
|
||||
char **device_map = 0;
|
||||
|
|
@ -137,15 +137,16 @@ grub_stage2 (void)
|
|||
|
||||
/* Probe devices for creating the device map. */
|
||||
|
||||
/* Iniitialize DEVICE_MAP. */
|
||||
memset (device_map, 0, NUM_DISKS * sizeof (char *));
|
||||
/* Initialize DEVICE_MAP. */
|
||||
for (i = 0; i < NUM_DISKS; i++)
|
||||
device_map[i] = 0;
|
||||
|
||||
/* Floppies. */
|
||||
device_map[0] = strdup ("/dev/fd0");
|
||||
assign_device_name (0, "/dev/fd0");
|
||||
#ifndef __linux__
|
||||
/* FIXME: leave linux out for now /dev/fd1 blocks for long time
|
||||
if there is no second floppy ? */
|
||||
device_map[1] = strdup ("/dev/fd1");
|
||||
assign_device_name (1, "/dev/fd1");
|
||||
#endif
|
||||
|
||||
/* IDE disks. */
|
||||
|
|
@ -176,7 +177,7 @@ grub_stage2 (void)
|
|||
reactivated if `removable disks' and CDROMs are
|
||||
supported. */
|
||||
/* register it, it may be inserted. */
|
||||
device_map[num_hd++ + 0x80] = strdup (name);
|
||||
assign_device_name (num_hd++ + 0x80, name);
|
||||
#endif
|
||||
break;
|
||||
#endif /* ENOMEDIUM */
|
||||
|
|
@ -197,21 +198,20 @@ grub_stage2 (void)
|
|||
}
|
||||
|
||||
fclose (fp);
|
||||
device_map[num_hd++ + 0x80] = strdup (name);
|
||||
assign_device_name (num_hd++ + 0x80, name);
|
||||
}
|
||||
|
||||
/* The rest is SCSI disks. */
|
||||
for (i = 0; i < 8; i++)
|
||||
{
|
||||
char *name = malloc (10);
|
||||
char name[10];
|
||||
|
||||
assert (name);
|
||||
#ifdef __linux__
|
||||
sprintf (name, "/dev/sd%c", i + 'a');
|
||||
#elif defined(__GNU__)
|
||||
sprintf (name, "/dev/sd%d", i);
|
||||
#endif
|
||||
device_map[num_hd++ + 0x80] = name;
|
||||
assign_device_name (num_hd++ + 0x80, name);
|
||||
}
|
||||
|
||||
/* Check some invariants. */
|
||||
|
|
@ -276,6 +276,24 @@ grub_stage2 (void)
|
|||
return status;
|
||||
}
|
||||
|
||||
/* Assign DRIVE to a device name DEVICE. */
|
||||
void
|
||||
assign_device_name (int drive, const char *device)
|
||||
{
|
||||
/* If DRIVE is already assigned, free it. */
|
||||
if (device_map[drive])
|
||||
free (device_map[drive]);
|
||||
|
||||
/* If the old one is already opened, close it. */
|
||||
if (disks[drive].flags != -1)
|
||||
{
|
||||
close (disks[drive].flags);
|
||||
disks[drive].flags = -1;
|
||||
}
|
||||
|
||||
/* Assign DRIVE to DEVICE. */
|
||||
device_map[drive] = strdup (device);
|
||||
}
|
||||
|
||||
void
|
||||
stop (void)
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ static struct builtin builtin_chainloader =
|
|||
chainloader_func,
|
||||
BUILTIN_CMDLINE,
|
||||
"chainloader FILE",
|
||||
"Load FILE as a chain-loader."
|
||||
"Load the chain-loader FILE."
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -284,6 +284,50 @@ static struct builtin builtin_default =
|
|||
#endif
|
||||
};
|
||||
|
||||
|
||||
/* device */
|
||||
static int
|
||||
device_func (char *arg, int flags)
|
||||
{
|
||||
#ifdef GRUB_UTIL
|
||||
char *drive = arg;
|
||||
char *device;
|
||||
char *ptr;
|
||||
|
||||
/* Get the drive number from DRIVE. */
|
||||
if (! set_device (drive))
|
||||
return 1;
|
||||
|
||||
/* Get the device argument. */
|
||||
device = skip_to (0, drive);
|
||||
if (! *device)
|
||||
{
|
||||
errnum = ERR_FILE_NOT_FOUND;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* Terminate DEVICE. */
|
||||
ptr = device;
|
||||
while (*ptr && *ptr != ' ')
|
||||
ptr++;
|
||||
*ptr = 0;
|
||||
|
||||
assign_device_name (current_drive, device);
|
||||
#endif /* GRUB_UTIL */
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static struct builtin builtin_device =
|
||||
{
|
||||
"device",
|
||||
device_func,
|
||||
BUILTIN_MENU | BUILTIN_CMDLINE,
|
||||
"device DRIVE DEVICE",
|
||||
"Specify DEVICE as the actual drive for a BIOS drive DRIVE. This command"
|
||||
" is just ignored in the native Stage 2."
|
||||
};
|
||||
|
||||
|
||||
/* displaymem */
|
||||
static int
|
||||
|
|
@ -357,7 +401,7 @@ static struct builtin builtin_fallback =
|
|||
"Go into unattended boot mode: if the default boot entry has any"
|
||||
" errors, instead of waiting for the user to do anything, it"
|
||||
" immediately starts over using the NUM entry (same numbering as the"
|
||||
" `default=' command). This obviously won't help if the machine"
|
||||
" `default' command). This obviously won't help if the machine"
|
||||
" was rebooted by a kernel that GRUB loaded."
|
||||
#endif
|
||||
};
|
||||
|
|
@ -396,8 +440,13 @@ static int
|
|||
geometry_func (char *arg, int flags)
|
||||
{
|
||||
struct geometry geom;
|
||||
char *msg;
|
||||
char *device = arg;
|
||||
#ifdef GRUB_UTIL
|
||||
char *ptr;
|
||||
#endif
|
||||
|
||||
set_device (arg);
|
||||
set_device (device);
|
||||
if (errnum)
|
||||
return 1;
|
||||
|
||||
|
|
@ -406,9 +455,35 @@ geometry_func (char *arg, int flags)
|
|||
errnum = ERR_NO_DISK;
|
||||
return 1;
|
||||
}
|
||||
else
|
||||
|
||||
#ifdef GRUB_UTIL
|
||||
ptr = skip_to (0, device);
|
||||
if (*ptr)
|
||||
{
|
||||
char *msg;
|
||||
char *cylinder, *head, *sector, *total_sector;
|
||||
int num_cylinder, num_head, num_sector, num_total_sector;
|
||||
|
||||
cylinder = ptr;
|
||||
head = skip_to (0, cylinder);
|
||||
sector = skip_to (0, head);
|
||||
total_sector = skip_to (0, sector);
|
||||
if (! safe_parse_maxint (&cylinder, &num_cylinder)
|
||||
|| ! safe_parse_maxint (&head, &num_head)
|
||||
|| ! safe_parse_maxint (§or, &num_sector))
|
||||
return 1;
|
||||
|
||||
disks[current_drive].cylinders = num_cylinder;
|
||||
disks[current_drive].heads = num_head;
|
||||
disks[current_drive].sectors = num_sector;
|
||||
|
||||
if (safe_parse_maxint (&total_sector, &num_total_sector))
|
||||
disks[current_drive].total_sectors = num_total_sector;
|
||||
else
|
||||
disks[current_drive].total_sectors
|
||||
= num_cylinder * num_head * num_sector;
|
||||
errnum = 0;
|
||||
}
|
||||
#endif /* GRUB_UTIL */
|
||||
|
||||
#ifdef GRUB_UTIL
|
||||
msg = device_map[current_drive];
|
||||
|
|
@ -424,7 +499,6 @@ geometry_func (char *arg, int flags)
|
|||
current_drive,
|
||||
geom.cylinders, geom.heads, geom.sectors,
|
||||
geom.total_sectors, msg);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -434,8 +508,13 @@ static struct builtin builtin_geometry =
|
|||
"geometry",
|
||||
geometry_func,
|
||||
BUILTIN_CMDLINE,
|
||||
"geometry DRIVE",
|
||||
"Print the information for the drive DRIVE."
|
||||
"geometry DRIVE [CYLINDER HEAD SECTOR [TOTAL_SECTOR]]",
|
||||
"Print the information for a drive DRIVE. In the grub shell, you can"
|
||||
"set the geometry of the drive arbitrarily. The number of the cylinders,"
|
||||
" the one of the heads, the one of the sectors and the one of the total"
|
||||
" sectors are set to CYLINDER, HEAD, SECTOR and TOTAL_SECTOR,"
|
||||
"respectively. If you omit TOTAL_SECTOR, then it will be calculated based"
|
||||
" on the C/H/S values automatically."
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -999,7 +1078,7 @@ static struct builtin builtin_module =
|
|||
" interpretation of the file contents is made, so users of this"
|
||||
" command must know what the kernel in question expects). The"
|
||||
" rest of the line is passed as the \"module command line\", like"
|
||||
" the `kernel=' command."
|
||||
" the `kernel' command."
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -1028,7 +1107,7 @@ static struct builtin builtin_modulenounzip =
|
|||
modulenounzip_func,
|
||||
BUILTIN_CMDLINE,
|
||||
"modulenounzip FILE [ARG ...]",
|
||||
"The same as `module=', except that automatic decompression is"
|
||||
"The same as `module', except that automatic decompression is"
|
||||
" disabled."
|
||||
};
|
||||
|
||||
|
|
@ -1081,10 +1160,7 @@ static struct builtin builtin_pause =
|
|||
pause_func,
|
||||
BUILTIN_CMDLINE,
|
||||
"pause [MESSAGE ...]",
|
||||
"Print the MESSAGE, then wait until a key is pressed. Note that"
|
||||
" placing <^G> (ASCII code 7) in the message will cause the speaker"
|
||||
" to emit the standard beep sound, which is useful when prompting"
|
||||
" the user to change floppies."
|
||||
"Print MESSAGE, then wait until a key is pressed."
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -1205,10 +1281,10 @@ static struct builtin builtin_rootnoverify =
|
|||
rootnoverify_func,
|
||||
BUILTIN_CMDLINE,
|
||||
"rootnoverify DEVICE [HDBIAS]",
|
||||
"Similar to `root=', but don't attempt to mount the partition. This"
|
||||
"Similar to `root', but don't attempt to mount the partition. This"
|
||||
" is useful for when an OS is outside of the area of the disk that"
|
||||
" GRUB can read, but setting the correct root partition is still"
|
||||
" desired. Note that the items mentioned in `root=' which"
|
||||
" desired. Note that the items mentioned in `root' which"
|
||||
" derived from attempting the mount will NOT work correctly."
|
||||
};
|
||||
|
||||
|
|
@ -1401,6 +1477,7 @@ struct builtin *builtin_table[] =
|
|||
&builtin_configfile,
|
||||
&builtin_debug,
|
||||
&builtin_default,
|
||||
&builtin_device,
|
||||
&builtin_displaymem,
|
||||
&builtin_fallback,
|
||||
&builtin_fstest,
|
||||
|
|
|
|||
|
|
@ -336,6 +336,10 @@ extern int verbose;
|
|||
extern int read_only;
|
||||
/* The map between BIOS drives and UNIX device file names. */
|
||||
extern char **device_map;
|
||||
/* The array of geometries. */
|
||||
extern struct geometry *disks;
|
||||
/* Assign DRIVE to a device name DEVICE. */
|
||||
extern void assign_device_name (int drive, const char *device);
|
||||
#endif
|
||||
|
||||
#ifndef STAGE1_5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue