Remove remaining traces of d_boot[01]

4 files changed, 2 insertions, 42 deletions

diff --git a/sbin/bsdlabel/bsdlabel.5 b/sbin/bsdlabel/bsdlabel.5
index 421a1c6..7b81671 100644
--- a/sbin/bsdlabel/bsdlabel.5
+++ b/sbin/bsdlabel/bsdlabel.5
@@ -161,25 +161,7 @@ struct disklabel {
 	u_int16_t d_type;		/* drive type */
 	u_int16_t d_subtype;		/* controller/d_type specific */
 	char	  d_typename[16];	/* type name, e.g. "eagle" */
-
-	/*
-	 * d_packname contains the pack identifier and is returned when
-	 * the disklabel is read off the disk or in-core copy.
-	 * d_boot0 and d_boot1 are the (optional) names of the
-	 * primary (block 0) and secondary (block 1-15) bootstraps
-	 * as found in /boot.  These are returned when using
-	 * getdiskbyname(3) to retrieve the values from /etc/disktab.
-	 */
-	union {
-		char	un_d_packname[16];	/* pack identifier */
-		struct {
-			char *un_d_boot0;	/* primary bootstrap name */
-			char *un_d_boot1;	/* secondary bootstrap name */
-		} un_b;
-	} d_un;
-#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
+	char	  d_packname[16];	/* pack identifier */
 
 			/* disk geometry: */
 	u_int32_t d_secsize;		/* # of bytes per sector */
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c
index c007a9a..b5c2cc2 100644
--- a/sbin/bsdlabel/bsdlabel.c
+++ b/sbin/bsdlabel/bsdlabel.c
@@ -1625,8 +1625,6 @@ getvirginlabel(void)
 	return (NULL);
     out:
 	close(f);
-	lab.d_boot0 = NULL;
-	lab.d_boot1 = NULL;
 	return (&lab);
 }
 
diff --git a/sbin/disklabel/disklabel.5 b/sbin/disklabel/disklabel.5
index 421a1c6..7b81671 100644
--- a/sbin/disklabel/disklabel.5
+++ b/sbin/disklabel/disklabel.5
@@ -161,25 +161,7 @@ struct disklabel {
 	u_int16_t d_type;		/* drive type */
 	u_int16_t d_subtype;		/* controller/d_type specific */
 	char	  d_typename[16];	/* type name, e.g. "eagle" */
-
-	/*
-	 * d_packname contains the pack identifier and is returned when
-	 * the disklabel is read off the disk or in-core copy.
-	 * d_boot0 and d_boot1 are the (optional) names of the
-	 * primary (block 0) and secondary (block 1-15) bootstraps
-	 * as found in /boot.  These are returned when using
-	 * getdiskbyname(3) to retrieve the values from /etc/disktab.
-	 */
-	union {
-		char	un_d_packname[16];	/* pack identifier */
-		struct {
-			char *un_d_boot0;	/* primary bootstrap name */
-			char *un_d_boot1;	/* secondary bootstrap name */
-		} un_b;
-	} d_un;
-#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
+	char	  d_packname[16];	/* pack identifier */
 
 			/* disk geometry: */
 	u_int32_t d_secsize;		/* # of bytes per sector */
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index c007a9a..b5c2cc2 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1625,8 +1625,6 @@ getvirginlabel(void)
 	return (NULL);
     out:
 	close(f);
-	lab.d_boot0 = NULL;
-	lab.d_boot1 = NULL;
 	return (&lab);
 }