summaryrefslogtreecommitdiff
path: root/sys/arch/i386/stand/cdboot
diff options
context:
space:
mode:
authorKenneth R Westerback <krw@cvs.openbsd.org>2011-03-08 17:24:32 +0000
committerKenneth R Westerback <krw@cvs.openbsd.org>2011-03-08 17:24:32 +0000
commit89b8def59d9a3017d87424b789c1b7b9d7dbdbe3 (patch)
tree06c9440fd1aa9cd4d3a8613a3b662b5d063c8010 /sys/arch/i386/stand/cdboot
parenta0c058adbc7d11b87af5362d9f3f9ef5232e8af6 (diff)
Fix extended partition searching so we don't get lost. The offset
of the next EBR is relative to the start of the extended partition described in the first MBR, not relative to the EBR specifying the offset in its extended partition entry. Clean up installboot -v output. Use daddr64_t for all sector numbers. Not a complete fix, but better than what we had. More tweaks to come. Inspired by a diff and cluebat from uscav on tech@ a few weeks ago. Feedback from matthew@, weingart@. ok deraadt@
Diffstat (limited to 'sys/arch/i386/stand/cdboot')
-rw-r--r--sys/arch/i386/stand/cdboot/conf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/i386/stand/cdboot/conf.c b/sys/arch/i386/stand/cdboot/conf.c
index 597fb2e4f64..15c11cf01b5 100644
--- a/sys/arch/i386/stand/cdboot/conf.c
+++ b/sys/arch/i386/stand/cdboot/conf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: conf.c,v 1.16 2010/12/06 22:51:45 jasper Exp $ */
+/* $OpenBSD: conf.c,v 1.17 2011/03/08 17:24:31 krw Exp $ */
/*
* Copyright (c) 2004 Tom Cosgrove
@@ -44,7 +44,7 @@
#include <dev/cons.h>
#include "debug.h"
-const char version[] = "3.15";
+const char version[] = "3.16";
int debug = 1;
#undef _TEST