Module Name: src
Committed By: msaitoh
Date: Wed Oct 23 06:04:44 UTC 2019
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: bsddisklabel.c disks.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #365):
usr.sbin/sysinst/bsddisklabel.c: revision 1.28
usr.sbin/sysinst/disks.c: revision 1.53
Skip unwanted (zero sized) partitions.
To generate a diff of this commit:
cvs rdiff -u -r1.23.2.3 -r1.23.2.4 src/usr.sbin/sysinst/bsddisklabel.c
cvs rdiff -u -r1.44.2.7 -r1.44.2.8 src/usr.sbin/sysinst/disks.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.23.2.3 src/usr.sbin/sysinst/bsddisklabel.c:1.23.2.4
--- src/usr.sbin/sysinst/bsddisklabel.c:1.23.2.3 Thu Aug 29 06:46:13 2019
+++ src/usr.sbin/sysinst/bsddisklabel.c Wed Oct 23 06:04:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: bsddisklabel.c,v 1.23.2.3 2019/08/29 06:46:13 msaitoh Exp $ */
+/* $NetBSD: bsddisklabel.c,v 1.23.2.4 2019/10/23 06:04:44 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1278,6 +1278,8 @@ apply_settings_to_partitions(struct pm_d
for (i = 0; i < wanted->num; i++) {
if (wanted->infos[i].cur_part_id != NO_PART)
continue;
+ if (wanted->infos[i].size <= 0)
+ continue;
if (t.start == infos[i].start) {
wanted->infos[i].cur_part_id = pno;
wanted->infos[i].cur_start = infos[i].start;
Index: src/usr.sbin/sysinst/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.44.2.7 src/usr.sbin/sysinst/disks.c:1.44.2.8
--- src/usr.sbin/sysinst/disks.c:1.44.2.7 Wed Oct 23 05:58:13 2019
+++ src/usr.sbin/sysinst/disks.c Wed Oct 23 06:04:44 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.44.2.7 2019/10/23 05:58:13 msaitoh Exp $ */
+/* $NetBSD: disks.c,v 1.44.2.8 2019/10/23 06:04:44 msaitoh Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -1290,6 +1290,9 @@ make_fstab(struct install_partition_desc
const struct part_usage_info *ptn = &install->infos[i];
+ if (ptn->size == 0)
+ continue;
+
if (ptn->type != PT_swap &&
(ptn->instflags & PUIINST_MOUNT) == 0)
continue;
