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

* util/grub-setup.c (setup): Handle NetBSD and OpenBSD disklabels.

Browse source 
Reported and tested by: Grégoire Sutre.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-01-07 13:27:34 +01:00
parent 415502c26a
commit 014b68068d
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-01-07 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-setup.c (setup): Handle NetBSD and OpenBSD disklabels.
Reported and tested by: Grégoire Sutre.
2011-01-06 Colin Watson <cjwatson@ubuntu.com> 2011-01-06 Colin Watson <cjwatson@ubuntu.com>
* tests/util/grub-shell.in: Set serial terminfo type to `dumb', to * tests/util/grub-shell.in: Set serial terminfo type to `dumb', to

16
util/grub-setup.c
View file

@ -49,6 +49,7 @@
#include <grub/emu/getroot.h> #include <grub/emu/getroot.h>
#include "progname.h" #include "progname.h"
#include <grub/reed_solomon.h> #include <grub/reed_solomon.h>
#include <grub/msdos_partition.h>
#define _GNU_SOURCE 1 #define _GNU_SOURCE 1
#include <argp.h> #include <argp.h>
@ -339,6 +340,12 @@ setup (const char *dir,
{ {
if (p->parent != container) if (p->parent != container)
return 0; return 0;
/* NetBSD and OpenBSD subpartitions have metadata inside a partition,
so they are safe to ignore.
*/
if (grub_strcmp (p->partmap->name, "netbsd") == 0
|| grub_strcmp (p->partmap->name, "openbsd") == 0)
return 0;
if (dest_partmap == NULL) if (dest_partmap == NULL)
{ {
dest_partmap = p->partmap; dest_partmap = p->partmap;
@ -352,6 +359,15 @@ setup (const char *dir,
grub_partition_iterate (dest_dev->disk, identify_partmap); grub_partition_iterate (dest_dev->disk, identify_partmap);
if (container && grub_strcmp (container->partmap->name, "msdos") == 0
&& dest_partmap
&& (container->msdostype == GRUB_PC_PARTITION_TYPE_NETBSD
|| container->msdostype == GRUB_PC_PARTITION_TYPE_OPENBSD))
{
grub_util_warn (_("Attempting to install GRUB to a disk with multiple partition labels or both partition label and filesystem. This is not supported yet."));
goto unable_to_embed;
}
fs = grub_fs_probe (dest_dev); fs = grub_fs_probe (dest_dev);
if (!fs) if (!fs)
grub_errno = GRUB_ERR_NONE; grub_errno = GRUB_ERR_NONE;