Module Name: src
Committed By: martin
Date: Tue Jul 9 16:25:05 UTC 2019
Modified Files:
src/usr.sbin/sysinst: bsddisklabel.c
Log Message:
When we are going to create (and populate) a new boot partition, we should
newfs and mount it.
Fix arguments to the MD_PART_DEFAULTS macro and invoke it a bit earlier
(before we shift things around).
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 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.17 src/usr.sbin/sysinst/bsddisklabel.c:1.18
--- src/usr.sbin/sysinst/bsddisklabel.c:1.17 Tue Jul 9 16:21:52 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Tue Jul 9 16:25:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.17 2019/07/09 16:21:52 martin Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.18 2019/07/09 16:25:05 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -72,7 +72,7 @@ default_parts_init[] =
.mount = PART_BOOT_MOUNT,
.instflags = PUIINST_MOUNT|PUIINST_BOOT,
#else
- .instflags = PUIINST_MOUNT|PUIINST_BOOT,
+ .instflags = PUIINST_BOOT,
#endif
#ifdef PART_BOOT_TYPE
.fs_type = PART_BOOT_TYPE,
@@ -996,6 +996,11 @@ fill_defaults(struct partition_usage_set
}
memcpy(wanted->infos, default_parts_init, sizeof(default_parts_init));
+
+#ifdef MD_PART_DEFAULTS
+ MD_PART_DEFAULTS(pm, wanted->infos, wanted->num);
+#endif
+
for (i = 0; i < wanted->num; i++) {
wanted->infos[i].parts = parts;
wanted->infos[i].cur_part_id = NO_PART;
@@ -1035,10 +1040,6 @@ fill_defaults(struct partition_usage_set
get_ramsize() * (MEG/512/4);
}
-#ifdef MD_PART_DEFAULTS
- MD_PART_DEFAULTS(pm, wanted->infos[i].parts, wanted->num);
-#endif
-
/*
* Now we have the defaults as if we were installing to an
* empty disk. Merge the partitions in target range that are already
