diff options
| author | Kevin Lo <kevlo@FreeBSD.org> | 2021-07-06 19:57:08 +0800 |
|---|---|---|
| committer | Kevin Lo <kevlo@FreeBSD.org> | 2021-07-06 19:57:08 +0800 |
| commit | 310466c582bf8c7b816ecdf1d26234189aaa3c11 (patch) | |
| tree | 05aae9b561d28d97f62c59638add200bedeb26e1 /sysutils/grub2-pcbsd/files/patch-util_grub-probe.c | |
| parent | games/cataclysm-dda: update to 0.F (diff) | |
sysutils/grub2-pcbsd: fix build with gcc10
Revive grub2-pcbsd and grub2-efi ports.
Thanks to lwhsu for valuable input.
Approved by: lwhsu
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: |