[src/trunk]: src/usr.sbin/sysinst When merging existing partitions with desir...

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

details:   https://anonhg.NetBSD.org/src/rev/1f6f23eb8e49
branches:  trunk
changeset: 976817:1f6f23eb8e49
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Oct 04 19:05:47 2020 +0000

description:
When merging existing partitions with desired target system layout
information, only force the "mount" flag if the existing partitions
has a valid mount point.

diffstat:

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

diffs (20 lines):

diff -r 2e09961885c4 -r 1f6f23eb8e49 usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Sun Oct 04 19:04:48 2020 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Sun Oct 04 19:05:47 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.47 2020/10/04 16:09:12 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.48 2020/10/04 19:05:47 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -869,7 +869,9 @@
                wanted->infos[i].cur_start = info->start;
                wanted->infos[i].flags &= ~PUIFLAG_EXTEND;
                if (wanted->infos[i].fs_type != FS_UNUSED &&
-                   wanted->infos[i].type != PT_swap)
+                   wanted->infos[i].type != PT_swap &&
+                   info->last_mounted != NULL &&
+                   info->last_mounted[0] != 0)
                        wanted->infos[i].instflags |= PUIINST_MOUNT;
                if (is_outer)
                        wanted->infos[i].flags |= PUIFLG_IS_OUTER;