summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorFederico G. Schwindt <fgsch@cvs.openbsd.org>2009-09-15 21:51:52 +0000
committerFederico G. Schwindt <fgsch@cvs.openbsd.org>2009-09-15 21:51:52 +0000
commit6c953161aa113beaadb5f18d890d2b2b6191adeb (patch)
tree2171126b429f4a788c0dd37715b943a5881e2211 /sbin
parent88e309d06c4da0ed7c742b5f0350127e441b10fd (diff)
also ignore boundaries when checking if the disklabel was modified when -e
is used. discussed and ok krw@
Diffstat (limited to 'sbin')
-rw-r--r--sbin/disklabel/disklabel.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 1133519c7bb..ef9af498a99 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.c,v 1.158 2009/06/04 21:13:03 deraadt Exp $ */
+/* $OpenBSD: disklabel.c,v 1.159 2009/09/15 21:51:51 fgsch Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -39,7 +39,7 @@ static const char copyright[] =
#endif /* not lint */
#ifndef lint
-static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.158 2009/06/04 21:13:03 deraadt Exp $";
+static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.159 2009/09/15 21:51:51 fgsch Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -1444,6 +1444,10 @@ cmplabel(struct disklabel *lp1, struct disklabel *lp2)
lab1.d_checksum = lab2.d_checksum;
lab1.d_bbsize = lab2.d_bbsize;
lab1.d_sbsize = lab2.d_sbsize;
+ lab1.d_bstart = lab2.d_bstart;
+ lab1.d_bstarth = lab2.d_bstarth;
+ lab1.d_bend = lab2.d_bend;
+ lab1.d_bendh = lab2.d_bendh;
return (memcmp(&lab1, &lab2, sizeof(struct disklabel)));
}