summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1996-10-04 07:24:59 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1996-10-04 07:24:59 +0000
commitfa543d8259d0a41f754fddb7553f9e5dcd79c096 (patch)
tree407422217e429e5efa8bd5c57ec00cc5237b80bd
parent1f2b521f0953b2d23dc2e3bafe24a6af65b5b6ed (diff)
-n fix, one more DOSPTYP_OPENBSD change
-rw-r--r--sbin/disklabel/disklabel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index aaed7eede78..a9d8d069df8 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.c,v 1.22 1996/10/01 09:23:38 maja Exp $ */
+/* $OpenBSD: disklabel.c,v 1.23 1996/10/04 07:24:58 deraadt Exp $ */
/* $NetBSD: disklabel.c,v 1.30 1996/03/14 19:49:24 ghudson Exp $ */
/*
@@ -44,7 +44,7 @@ static char copyright[] =
#endif /* not lint */
#ifndef lint
-static char rcsid[] = "$OpenBSD: disklabel.c,v 1.22 1996/10/01 09:23:38 maja Exp $";
+static char rcsid[] = "$OpenBSD: disklabel.c,v 1.23 1996/10/04 07:24:58 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -384,7 +384,7 @@ writelabel(f, boot, lp)
* otherwise we reject the request as meaningless. -wfj
*/
if (dosdp && pp->p_size &&
- (dosdp->dp_typ == DOSPTYP_386BSD ||
+ (dosdp->dp_typ == DOSPTYP_OPENBSD ||
dosdp->dp_typ == DOSPTYP_386BSD)) {
sectoffset = dosdp->dp_start * lp->d_secsize;
} else {
@@ -482,7 +482,7 @@ writelabel(f, boot, lp)
/*
* Output the remainder of the disklabel
*/
- if (bootbuf && write(f, bootbuf, bootsize) != bootsize) {
+ if (!donothing && bootbuf && write(f, bootbuf, bootsize) != bootsize) {
perror("write");
return(1);
}