[src/trunk]: src/usr.sbin/sysinst If low on ram, mount the proper swap partit...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cda2509068b3
branches:  trunk
changeset: 452257:cda2509068b3
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jun 24 18:48:08 2019 +0000

description:
If low on ram, mount the proper swap partition before doing the main
upgrade work.

diffstat:

 usr.sbin/sysinst/upgrade.c |  10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diffs (31 lines):

diff -r 37f0361323a9 -r cda2509068b3 usr.sbin/sysinst/upgrade.c
--- a/usr.sbin/sysinst/upgrade.c        Mon Jun 24 13:58:24 2019 +0000
+++ b/usr.sbin/sysinst/upgrade.c        Mon Jun 24 18:48:08 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: upgrade.c,v 1.8 2019/06/20 00:43:55 christos Exp $     */
+/*     $NetBSD: upgrade.c,v 1.9 2019/06/24 18:48:08 martin Exp $       */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -67,11 +67,6 @@
        if (find_disks(msg_string(MSG_upgrade)) < 0)
                return;
 
-       /* XXX - build install_partition_desc from existing partitions
-        * and pass that here and below instead of NULL */
-       if (set_swap_if_low_ram(NULL) < 0)
-               return;
-
        if (pm->parts->pscheme->pre_update_verify) {
                if (pm->parts->pscheme->pre_update_verify(pm->parts))
                        pm->parts->pscheme->write_to_disk(pm->parts);
@@ -79,6 +74,9 @@
 
        install_desc_from_parts(&install, pm->parts);
 
+       if (set_swap_if_low_ram(&install) < 0)
+               return;
+
        if (md_pre_update(&install) < 0)
                goto free_install;