From 493210897221d7a7520ed88494339623a8d0cbb9 Mon Sep 17 00:00:00 2001 From: Theo de Raadt Date: Thu, 4 Jun 2009 21:13:04 +0000 Subject: Recycle four ancient fields in the disklabel structure, replacing them with bounds information, ie. the zone of the disk that OpenBSD can use. Have each pre-disklabel parser (MBR, DPME, or per-arch MD disklabel parsers) figure out this area and pass it up to userland. Then, delete all the same disk parsing code from disklabel(8) since the kernel passes it up. Lots and lots of - signs in the disklabel(8) code. Tested on as many platforms as possible, the fallout will be repaired as time goes on. To test, use disklabel -d and validate that the bounds do not overlap any boot blocks. This same information is used by disklabel -A... OK for the concept from krw, miod, and drahn --- sbin/disklabel/extern.h | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'sbin/disklabel/extern.h') diff --git a/sbin/disklabel/extern.h b/sbin/disklabel/extern.h index ea86a4c0a39..75397700e38 100644 --- a/sbin/disklabel/extern.h +++ b/sbin/disklabel/extern.h @@ -1,4 +1,4 @@ -/* $OpenBSD: extern.h,v 1.16 2009/06/02 16:23:45 krw Exp $ */ +/* $OpenBSD: extern.h,v 1.17 2009/06/04 21:13:03 deraadt Exp $ */ /* * Copyright (c) 2003 Theo de Raadt @@ -37,11 +37,3 @@ extern int aflag, dflag; extern int donothing; extern int verbose; extern char print_unit; - -#ifdef DOSLABEL -extern struct dos_partition *dosdp; /* DOS partition, if found */ -#endif -#ifdef DPMELABEL -extern int dpme_label; /* nonzero if DPME table */ -extern uint32_t dpme_obsd_start, dpme_obsd_size; /* OpenBSD DPME boundaries */ -#endif -- cgit v1.2.3