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

PR 56303: do not borrow from the default swap allocation if we are in 

tiny ram conditions and will need to enable swap early.
This commit is contained in:
martin 2021-07-20 16:41:27 +00:00
parent 64e2b749b9
commit a18ae2f2ae
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
usr.sbin/sysinst/bsddisklabel.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: bsddisklabel.c,v 1.58 2021/02/13 15:31:35 martin Exp $ */
/* $NetBSD: bsddisklabel.c,v 1.59 2021/07/20 16:41:27 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -1153,7 +1153,8 @@ fill_defaults(struct partition_usage_set *wanted, struct disk_partitions *parts,
continue;
free_space -= wanted->infos[i].size;
}
if (free_space < 0 && swap < wanted->num) {
if (free_space < 0 && swap < wanted->num &&
get_ramsize() > TINY_RAM_SIZE) {
/* steel from swap partition */
daddr_t d = wanted->infos[swap].size;
daddr_t inc = roundup(-free_space, align);