Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make kernel disklabel struct contain bootfile pointers, too, for uniformity.

This commit is contained in:
cgd 1995-02-05 14:09:25 +00:00
parent 336db78312
commit 20b945e1e1
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/sys/disklabel.h
View File

@ -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 * Copyright (c) 1987, 1988, 1993
@ -85,9 +85,6 @@ struct disklabel {
* as found in /usr/mdec. These are returned when using * as found in /usr/mdec. These are returned when using
* getdiskbyname(3) to retrieve the values from /etc/disktab. * getdiskbyname(3) to retrieve the values from /etc/disktab.
*/ */
#if defined(KERNEL) || defined(STANDALONE)
char d_packname[16]; /* pack identifier */
#else
union { union {
char un_d_packname[16]; /* pack identifier */ char un_d_packname[16]; /* pack identifier */
struct { struct {
@ -98,7 +95,6 @@ struct disklabel {
#define d_packname d_un.un_d_packname #define d_packname d_un.un_d_packname
#define d_boot0 d_un.un_b.un_d_boot0 #define d_boot0 d_un.un_b.un_d_boot0
#define d_boot1 d_un.un_b.un_d_boot1 #define d_boot1 d_un.un_b.un_d_boot1
#endif /* ! KERNEL or STANDALONE */
/* disk geometry: */ /* disk geometry: */
u_int32_t d_secsize; /* # of bytes per sector */ u_int32_t d_secsize; /* # of bytes per sector */