d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak booting from the true dedicated disks.

Browse Source 
When we open the disk, check the type of partition table, that has
been detected. If this is BSD label, then we assume this is DD mode.

Reported by:	dim@
This commit is contained in:
ae 2012-08-13 13:08:30 +00:00
parent fa7b327d11
commit 7244c0647c
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/boot/common/disk.c
View File

@ -173,7 +173,13 @@ disk_open(struct disk_devdesc *dev, off_t mediasize, u_int sectorsize)
rc = ENXIO;
goto out;
}
if (dev->d_slice > 0) {
if (ptable_gettype(od->table) == PTABLE_BSD &&
dev->d_partition >= 0) {
/* It doesn't matter what value has d_slice */
rc = ptable_getpart(od->table, &part, dev->d_partition);
if (rc == 0)
dev->d_offset = part.start;
} else if (dev->d_slice > 0) {
/* Try to get information about partition */
rc = ptable_getpart(od->table, &part, dev->d_slice);
if (rc != 0) /* Partition doesn't exist */
@ -247,9 +253,9 @@ disk_fmtdev(struct disk_devdesc *dev)
#ifdef LOADER_MBR_SUPPORT
cp += sprintf(cp, "s%d", dev->d_slice);
#endif
if (dev->d_partition >= 0)
cp += sprintf(cp, "%c", dev->d_partition + 'a');
}
if (dev->d_partition >= 0)
cp += sprintf(cp, "%c", dev->d_partition + 'a');
strcat(cp, ":");
return (buf);
}

5
sys/boot/common/disk.h
View File

@ -45,6 +45,11 @@
* d_slice = MBR slice number (typically 1..4)
* d_partition = disklabel partition (typically 0..7)
*
* BSD disklabel partition on the true dedicated disk:
*
* d_slice = -1
* d_partition = disklabel partition (typically 0..7)
*
* GPT partition:
*
* d_slice = GPT partition number (typically 1..N)