Module Name: src
Committed By: martin
Date: Thu Jun 13 12:44:20 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
When merging existing partitions into our install description, mark
them as to-be-mounted.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 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.10 src/usr.sbin/sysinst/bsddisklabel.c:1.11
--- src/usr.sbin/sysinst/bsddisklabel.c:1.10 Thu Jun 13 12:31:28 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Thu Jun 13 12:44:20 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.10 2019/06/13 12:31:28 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.11 2019/06/13 12:44:20 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -932,6 +932,9 @@ merge_part_with_wanted(struct disk_parti
wanted->infos[i].size = info->size;
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].instflags |= PUIINST_MOUNT;
if (is_outer)
wanted->infos[i].flags |= PUIFLG_IS_OUTER;
return;
