summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorotto <otto@openbsd.org>2015-03-17 19:11:55 +0000
committerotto <otto@openbsd.org>2015-03-17 19:11:55 +0000
commit7c5666a070b656a9f12449b3589ce648e83dac54 (patch)
tree5c342f0eedbf970fe2e0b8294a5e258eb68b9e30
parentIt is impossible to build mg without both -DFKEYS and -DXKEYS. So let's (diff)
downloadwireguard-openbsd-7c5666a070b656a9f12449b3589ce648e83dac54.tar.xz
wireguard-openbsd-7c5666a070b656a9f12449b3589ce648e83dac54.zip
for small mem machines, make sure max does not get smaller than
min, otherwise the constraint cannot be satisfied; ok deraadt@ okan@
-rw-r--r--sbin/disklabel/editor.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index 0ef37d5b7cd..abd494433f0 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: editor.c,v 1.291 2015/01/20 18:22:20 deraadt Exp $ */
+/* $OpenBSD: editor.c,v 1.292 2015/03/17 19:11:55 otto Exp $ */
/*
* Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -580,7 +580,7 @@ again:
/* bump max swap based on phys mem, little physmem gets 2x swap */
if (index == 0) {
if (physmem < MEG(256))
- alloc[1].maxsz = 2 * physmem;
+ alloc[1].minsz = alloc[1].maxsz = 2 * physmem;
else
alloc[1].maxsz += physmem;
/* bump max /var to make room for 2 crash dumps */