[src/trunk]: src/usr.sbin/sysinst Properly handle partitions that we were req...

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

details:   https://anonhg.NetBSD.org/src/rev/0208b62b8cf8
branches:  trunk
changeset: 458619:0208b62b8cf8
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Aug 03 12:09:22 2019 +0000

description:
Properly handle partitions that we were requested to mount but not newfs.

diffstat:

 usr.sbin/sysinst/disks.c |  9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diffs (29 lines):

diff -r d82a4e3b6ec4 -r 0208b62b8cf8 usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Sat Aug 03 09:31:07 2019 +0000
+++ b/usr.sbin/sysinst/disks.c  Sat Aug 03 12:09:22 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.45 2019/08/01 16:32:06 martin Exp $ */
+/*     $NetBSD: disks.c,v 1.46 2019/08/03 12:09:22 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1112,17 +1112,14 @@
                ptn = &install->infos[i];
                parts = ptn->parts;
 
-               if (ptn->size == 0 || parts == NULL)
-                       continue;
+               if (ptn->size == 0 || parts == NULL|| ptn->type == PT_swap)
+                       continue;                       
 
                if (parts->pscheme->get_part_device(parts, ptn->cur_part_id,
                    devdev, sizeof devdev, &partno, parent_device_only, false)
                    && is_active_rootpart(devdev, partno))
                        continue;
 
-               if (!(ptn->instflags & PUIINST_NEWFS))
-                       continue;
-
                parts->pscheme->get_part_device(parts, ptn->cur_part_id,
                    devdev, sizeof devdev, &partno, plain_name, true);