summaryrefslogtreecommitdiff
path: root/sys/arch/hppa
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2002-02-19 02:46:41 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2002-02-19 02:46:41 +0000
commitc6839f962490abf9876dc231d78cf05526d854e0 (patch)
tree34da9a9c0837f43e47ff2aceba18416b97c78f65 /sys/arch/hppa
parent190c0f6693361834ec40851dc9b5a71d041338da (diff)
correct extended partition botch; gluk, in PR 1449
Diffstat (limited to 'sys/arch/hppa')
-rw-r--r--sys/arch/hppa/hppa/disksubr.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sys/arch/hppa/hppa/disksubr.c b/sys/arch/hppa/hppa/disksubr.c
index b572980013f..0394d8b26bd 100644
--- a/sys/arch/hppa/hppa/disksubr.c
+++ b/sys/arch/hppa/hppa/disksubr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disksubr.c,v 1.6 2000/10/18 21:00:34 mickey Exp $ */
+/* $OpenBSD: disksubr.c,v 1.7 2002/02/19 02:46:39 deraadt Exp $ */
/*
* Copyright (c) 1999 Michael Shalayeff
@@ -383,6 +383,8 @@ readdoslabel(bp, strat, lp, osdep, partoffp, cylp, spoofonly)
while (wander && n < 8 && loop < 8) {
loop++;
wander = 0;
+ if (part_blkno < extoff)
+ part_blkno = extoff;
/* read boot record */
bp->b_blkno = part_blkno;
@@ -490,8 +492,10 @@ donot:
break;
case DOSPTYP_EXTEND:
part_blkno = dp2->dp_start + extoff;
- if (!extoff)
+ if (!extoff) {
extoff = dp2->dp_start;
+ part_blkno = 0;
+ }
wander = 1;
break;
default: