diff options
Diffstat (limited to 'sys/arch/amd64/stand/libsa')
| -rw-r--r-- | sys/arch/amd64/stand/libsa/biosdev.c | 7 | ||||
| -rw-r--r-- | sys/arch/amd64/stand/libsa/softraid.c | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/sys/arch/amd64/stand/libsa/biosdev.c b/sys/arch/amd64/stand/libsa/biosdev.c index eafbe08fcab..0f91d8ff2e0 100644 --- a/sys/arch/amd64/stand/libsa/biosdev.c +++ b/sys/arch/amd64/stand/libsa/biosdev.c @@ -1,4 +1,4 @@ -/* $OpenBSD: biosdev.c,v 1.26 2015/10/01 16:16:23 krw Exp $ */ +/* $OpenBSD: biosdev.c,v 1.27 2015/10/01 20:28:12 krw Exp $ */ /* * Copyright (c) 1996 Michael Shalayeff @@ -441,15 +441,14 @@ bios_getdisklabel(bios_diskinfo_t *bd, struct disklabel *label) return "no OpenBSD partition\n"; } } - start = LABELSECTOR + start; /* Load BSD disklabel */ #ifdef BIOS_DEBUG if (debug) - printf("loading disklabel @ %u\n", start); + printf("loading disklabel @ %u\n", start + DOS_LABELSECTOR); #endif /* read disklabel */ - error = biosd_io(F_READ, bd, start, 1, buf); + error = biosd_io(F_READ, bd, start + DOS_LABELSECTOR, 1, buf); if (error) return "failed to read disklabel"; diff --git a/sys/arch/amd64/stand/libsa/softraid.c b/sys/arch/amd64/stand/libsa/softraid.c index 992b59b954a..bf46d86b85e 100644 --- a/sys/arch/amd64/stand/libsa/softraid.c +++ b/sys/arch/amd64/stand/libsa/softraid.c @@ -1,4 +1,4 @@ -/* $OpenBSD: softraid.c,v 1.12 2015/09/02 01:52:26 yasuoka Exp $ */ +/* $OpenBSD: softraid.c,v 1.13 2015/10/01 20:28:12 krw Exp $ */ /* * Copyright (c) 2012 Joel Sing <jsing@openbsd.org> @@ -421,10 +421,9 @@ sr_getdisklabel(struct sr_boot_volume *bv, struct disklabel *label) } } - start += LABELSECTOR; - /* Read the disklabel. */ - sr_strategy(bv, F_READ, start, sizeof(struct disklabel), buf, NULL); + sr_strategy(bv, F_READ, start + DOS_LABELSECTOR, + sizeof(struct disklabel), buf, NULL); #ifdef BIOS_DEBUG printf("sr_getdisklabel: magic %lx\n", |