[src/netbsd-9]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/977cc4a9f5f3
branches:  netbsd-9
changeset: 1000626:977cc4a9f5f3
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Aug 05 04:36:42 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #14):
        usr.sbin/sysinst/disks.c: revision 1.46
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 8578efe08bdd -r 977cc4a9f5f3 usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Mon Aug 05 04:34:54 2019 +0000
+++ b/usr.sbin/sysinst/disks.c  Mon Aug 05 04:36:42 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.44.2.1 2019/08/02 05:41:46 msaitoh Exp $ */
+/*     $NetBSD: disks.c,v 1.44.2.2 2019/08/05 04:36:42 msaitoh 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);