sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Allow grub to recognize bsdlabel disklabels.

Browse source 
- Bump PORTREVISION

PR:             ports/152978
Submitted by:   Rick Richard <rick@lgarchitecture.com> (maintainer)
This commit is contained in:
Philip M. Gollucci 2010-12-12 01:11:24 +00:00
parent 6762ffe211
commit d991a6baae
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=266089
2 changed files with 48 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sysutils/grub2/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= grub2 PORTNAME= grub2
PORTVERSION= 1.98 PORTVERSION= 1.98
PORTREVISION= 1
CATEGORIES= sysutils CATEGORIES= sysutils
MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/
DISTNAME= grub-${PORTVERSION} DISTNAME= grub-${PORTVERSION}

47
sysutils/grub2/files/patch-bsd-partmap Normal file
View file

@ -0,0 +1,47 @@
--- include/grub/msdos_partition.h 2010-03-06 20:51:37.000000000 +0000
+++ include/grub/msdos_partition.h 2010-11-17 18:22:29.000000000 +0000
@@ -57,6 +57,7 @@
#define GRUB_PC_PARTITION_BSD_LABEL_SECTOR 1
#define GRUB_PC_PARTITION_BSD_LABEL_MAGIC 0x82564557
#define GRUB_PC_PARTITION_BSD_MAX_ENTRIES 8
+#define GRUB_PC_PARTITION_BSD_RAW_PART 2
/* BSD partition types. */
#define GRUB_PC_PARTITION_BSD_TYPE_UNUSED 0
--- partmap/msdos.c 2010-03-06 20:51:37.000000000 +0000
+++ partmap/msdos.c 2010-11-17 18:26:26.000000000 +0000
@@ -176,6 +176,8 @@
/* Check if this is a BSD partition. */
if (grub_msdos_partition_is_bsd (e->type))
{
+ grub_uint32_t slice_offset = 0, raw_offset = 0;
+
/* Check if the BSD label is within the DOS partition. */
if (p.len <= GRUB_PC_PARTITION_BSD_LABEL_SECTOR)
{
@@ -200,6 +202,15 @@
label.magic, p.index);
continue;
}
+
+ /* Compensate for relative addressing in FreeBSD. */
+ if (e->type == GRUB_PC_PARTITION_TYPE_FREEBSD
+ && GRUB_PC_PARTITION_BSD_RAW_PART < grub_cpu_to_le16 (label.num_partitions))
+ {
+ slice_offset = p.start;
+ raw_offset = grub_le_to_cpu32 (label.entries[GRUB_PC_PARTITION_BSD_RAW_PART].offset);
+ }
+
for (pcdata.bsd_part = 0;
pcdata.bsd_part < grub_cpu_to_le16 (label.num_partitions);
pcdata.bsd_part++)
@@ -207,7 +218,9 @@
struct grub_msdos_partition_bsd_entry *be
= label.entries + pcdata.bsd_part;
+ if (grub_le_to_cpu32 (be->offset) < raw_offset)
+ continue;
- p.start = grub_le_to_cpu32 (be->offset);
+ p.start = grub_le_to_cpu32 (be->offset) - raw_offset + slice_offset;
p.len = grub_le_to_cpu32 (be->size);
pcdata.bsd_type = be->fs_type;