Module Name: src
Committed By: martin
Date: Sun Oct 4 19:05:47 UTC 2020
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
When merging existing partitions with desired target system layout
information, only force the "mount" flag if the existing partitions
has a valid mount point.
To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 src/usr.sbin/sysinst/bsddisklabel.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/bsddisklabel.c
diff -u src/usr.sbin/sysinst/bsddisklabel.c:1.47 src/usr.sbin/sysinst/bsddisklabel.c:1.48
--- src/usr.sbin/sysinst/bsddisklabel.c:1.47 Sun Oct 4 16:09:12 2020
+++ src/usr.sbin/sysinst/bsddisklabel.c Sun Oct 4 19:05:47 2020
@@ -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 @@ merge_part_with_wanted(struct disk_parti
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;
