From 20b945e1e100cd459e73d80090ebad3ff16d96ae Mon Sep 17 00:00:00 2001
From: cgd <cgd@NetBSD.org>
Date: Sun, 5 Feb 1995 14:09:25 +0000
Subject: [PATCH] make kernel disklabel struct contain bootfile pointers, too,
 for uniformity.

---
 sys/sys/disklabel.h | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 1b815502516a..e6b3204ff86e 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: disklabel.h,v 1.31 1994/12/13 15:54:52 mycroft Exp $	*/
+/*	$NetBSD: disklabel.h,v 1.32 1995/02/05 14:09:25 cgd Exp $	*/
 
 /*
  * Copyright (c) 1987, 1988, 1993
@@ -85,9 +85,6 @@ struct disklabel {
 	 * as found in /usr/mdec.  These are returned when using
 	 * getdiskbyname(3) to retrieve the values from /etc/disktab.
 	 */
-#if defined(KERNEL) || defined(STANDALONE)
-	char	  d_packname[16];		/* pack identifier */ 
-#else
 	union {
 		char	un_d_packname[16];	/* pack identifier */ 
 		struct {
@@ -98,7 +95,6 @@ struct disklabel {
 #define d_packname	d_un.un_d_packname
 #define d_boot0		d_un.un_b.un_d_boot0
 #define d_boot1		d_un.un_b.un_d_boot1
-#endif	/* ! KERNEL or STANDALONE */
 
 			/* disk geometry: */
 	u_int32_t d_secsize;		/* # of bytes per sector */