diff options
| author | Kris Moore <kmoore@FreeBSD.org> | 2015-06-07 22:38:33 +0000 |
|---|---|---|
| committer | Kris Moore <kmoore@FreeBSD.org> | 2015-06-07 22:38:33 +0000 |
| commit | 12e4fe286a7f39fcb48fa68759b3ff462062ba0a (patch) | |
| tree | 8c099e5034866f45fab6ad08305c732ff15bb360 /sysutils/grub2-pcbsd/files/patch-util_grub-probe.c | |
| parent | - Update to later GRUB git version from 6/4/2015 (diff) | |
Opps, forgot to delete/add some of the updated patches in files/
Notes
Notes:
svn path=/head/; revision=388791
Diffstat (limited to 'sysutils/grub2-pcbsd/files/patch-util_grub-probe.c')
| -rw-r--r-- | sysutils/grub2-pcbsd/files/patch-util_grub-probe.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sysutils/grub2-pcbsd/files/patch-util_grub-probe.c b/sysutils/grub2-pcbsd/files/patch-util_grub-probe.c new file mode 100644 index 000000000000..eb75b0c1587e --- /dev/null +++ b/sysutils/grub2-pcbsd/files/patch-util_grub-probe.c @@ -0,0 +1,19 @@ +--- util/grub-probe.c.orig 2015-06-03 14:54:01 UTC ++++ util/grub-probe.c +@@ -805,7 +805,16 @@ argp_parser (int key, char *arg, struct + + case ARGP_KEY_ARG: + assert (arguments->ndevices < arguments->device_max); ++#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) ++ /* Check if passing a FreeBSD geom label */ ++ if ( grub_util_check_geom_label(arg) ) ++ arguments->devices[arguments->ndevices++] = \ ++ xstrdup(grub_util_convert_geom_label_to_dev (arg + sizeof ("/dev/") - 1, 1)); ++ else ++ arguments->devices[arguments->ndevices++] = xstrdup(arg); ++#else + arguments->devices[arguments->ndevices++] = xstrdup(arg); ++#endif + break; + + default: |