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

* grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Accept "sd", "cd",

Browse source 
"vnd", "rd" and "fd" disks.
This commit is contained in:
Vladimir Serbinenko 2013-10-27 18:59:27 +01:00
parent 442b86de32
commit 8b46b0ea36
2 changed files with 29 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-27 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/loader/i386/bsd.c (grub_cmd_openbsd): Accept "sd", "cd",
"vnd", "rd" and "fd" disks.
2013-10-27 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-27 Vladimir Serbinenko <phcoder@gmail.com>
Move grub_disk_write out of kernel into disk.mod. Move grub_disk_write out of kernel into disk.mod.

31
grub-core/loader/i386/bsd.c
View file

@ -1564,6 +1564,15 @@ grub_cmd_freebsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
return grub_errno; return grub_errno;
} }
static const char *types[] = {
[0] = "wd",
[2] = "fd",
[4] = "sd",
[6] = "cd",
[14] = "vnd",
[17] = "rd"
};
static grub_err_t static grub_err_t
grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[]) grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
{ {
@ -1575,22 +1584,30 @@ grub_cmd_openbsd (grub_extcmd_context_t ctxt, int argc, char *argv[])
if (ctxt->state[OPENBSD_ROOT_ARG].set) if (ctxt->state[OPENBSD_ROOT_ARG].set)
{ {
const char *arg = ctxt->state[OPENBSD_ROOT_ARG].arg; const char *arg = ctxt->state[OPENBSD_ROOT_ARG].arg;
int unit, part; unsigned type, unit, part;
if (*(arg++) != 'w' || *(arg++) != 'd') for (type = 0; type < ARRAY_SIZE (types); type++)
if (types[type]
&& grub_strncmp (arg, types[type],
grub_strlen (types[type])) == 0)
{
arg += grub_strlen (types[type]);
break;
}
if (type == ARRAY_SIZE (types))
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"only device specifications of form " "unknown disk type name");
"wd<number><lowercase letter> are supported");
unit = grub_strtoul (arg, (char **) &arg, 10); unit = grub_strtoul (arg, (char **) &arg, 10);
if (! (arg && *arg >= 'a' && *arg <= 'z')) if (! (arg && *arg >= 'a' && *arg <= 'z'))
return grub_error (GRUB_ERR_BAD_ARGUMENT, return grub_error (GRUB_ERR_BAD_ARGUMENT,
"only device specifications of form " "only device specifications of form "
"wd<number><lowercase letter> are supported"); "<type><number><lowercase letter> are supported");
part = *arg - 'a'; part = *arg - 'a';
bootdev = (OPENBSD_B_DEVMAGIC + (unit << OPENBSD_B_UNITSHIFT) + bootdev = (OPENBSD_B_DEVMAGIC | (type << OPENBSD_B_TYPESHIFT)
(part << OPENBSD_B_PARTSHIFT)); | (unit << OPENBSD_B_UNITSHIFT)
| (part << OPENBSD_B_PARTSHIFT));
} }
else else
bootdev = 0; bootdev = 0;