diff options
| author |   fgsch <fgsch@openbsd.org> | 2009-09-15 21:51:51 +0000 |
|---|---|---|
| committer | fgsch <fgsch@openbsd.org> | 2009-09-15 21:51:51 +0000 |
| commit | fc88f2ee146b962cee7d8b22ec3e92d2cbb30f8a (patch) | |
| tree | 1ce84232fcf76f35211a323805927a758e992d65 | |
| parent | Make sure we block clock interrupts at IPL_CLOCK and higher. (diff) | |
| download | wireguard-openbsd-fc88f2ee146b962cee7d8b22ec3e92d2cbb30f8a.tar.xz wireguard-openbsd-fc88f2ee146b962cee7d8b22ec3e92d2cbb30f8a.zip | |
also ignore boundaries when checking if the disklabel was modified when -e
is used. discussed and ok krw@
| -rw-r--r-- | sbin/disklabel/disklabel.c | 8 |
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))); } |