Sat Oct 15 06:23:29 2016 UTC ()
revert part of revision 1.28. "e.g." is correct.  bad igor!


(snj)
diff -r1.28 -r1.29 src/sbin/disklabel/disklabel.5
cvs diff -r1.28 -r1.29 src/sbin/disklabel/disklabel.5 (expand / switch to unified diff)

--- src/sbin/disklabel/disklabel.5 2016/09/11 01:59:10 1.28
+++ src/sbin/disklabel/disklabel.5 2016/10/15 06:23:28 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: disklabel.5,v 1.28 2016/09/11 01:59:10 sevan Exp $ 1.\" $NetBSD: disklabel.5,v 1.29 2016/10/15 06:23:28 snj Exp $
2.\" 2.\"
3.\" Copyright (c) 1987, 1991, 1993 3.\" Copyright (c) 1987, 1991, 1993
4.\" The Regents of the University of California. All rights reserved. 4.\" The Regents of the University of California. All rights reserved.
5.\" 5.\"
6.\" This code is derived from software contributed to Berkeley by 6.\" This code is derived from software contributed to Berkeley by
7.\" Symmetric Computer Systems. 7.\" Symmetric Computer Systems.
8.\" 8.\"
9.\" Redistribution and use in source and binary forms, with or without 9.\" Redistribution and use in source and binary forms, with or without
10.\" modification, are permitted provided that the following conditions 10.\" modification, are permitted provided that the following conditions
11.\" are met: 11.\" are met:
12.\" 1. Redistributions of source code must retain the above copyright 12.\" 1. Redistributions of source code must retain the above copyright
13.\" notice, this list of conditions and the following disclaimer. 13.\" notice, this list of conditions and the following disclaimer.
14.\" 2. Redistributions in binary form must reproduce the above copyright 14.\" 2. Redistributions in binary form must reproduce the above copyright
@@ -126,27 +126,27 @@ is @@ -126,27 +126,27 @@ is
126#define MAXMAXPARTITIONS 22 126#define MAXMAXPARTITIONS 22
127#if MAXPARTITIONS \*[Gt] MAXMAXPARTITIONS 127#if MAXPARTITIONS \*[Gt] MAXMAXPARTITIONS
128#warning beware: MAXPARTITIONS bigger than MAXMAXPARTITIONS 128#warning beware: MAXPARTITIONS bigger than MAXMAXPARTITIONS
129#endif 129#endif
130 130
131 131
132#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */ 132#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */
133 133
134#ifndef _LOCORE 134#ifndef _LOCORE
135struct disklabel { 135struct disklabel {
136 u_int32_t d_magic; /* the magic number */ 136 u_int32_t d_magic; /* the magic number */
137 u_int16_t d_type; /* drive type */ 137 u_int16_t d_type; /* drive type */
138 u_int16_t d_subtype; /* controller/d_type specific */ 138 u_int16_t d_subtype; /* controller/d_type specific */
139 char d_typename[16]; /* type name, e.g "eagle" */ 139 char d_typename[16]; /* type name, e.g. "eagle" */
140 140
141 /* 141 /*
142 * d_packname contains the pack identifier and is returned when 142 * d_packname contains the pack identifier and is returned when
143 * the disklabel is read off the disk or in-core copy. 143 * the disklabel is read off the disk or in-core copy.
144 * d_boot0 and d_boot1 are the (optional) names of the 144 * d_boot0 and d_boot1 are the (optional) names of the
145 * primary (block 0) and secondary (block 1-15) bootstraps 145 * primary (block 0) and secondary (block 1-15) bootstraps
146 * as found in /usr/mdec. These are returned when using 146 * as found in /usr/mdec. These are returned when using
147 * getdiskbyname(3) to retrieve the values from /etc/disktab. 147 * getdiskbyname(3) to retrieve the values from /etc/disktab.
148 */ 148 */
149 union { 149 union {
150 char un_d_packname[16]; /* pack identifier */ 150 char un_d_packname[16]; /* pack identifier */
151 struct { 151 struct {
152 char *un_d_boot0; /* primary bootstrap name */ 152 char *un_d_boot0; /* primary bootstrap name */