Module Name: src Committed By: martin Date: Mon Oct 21 16:10:54 UTC 2019
Modified Files: src/usr.sbin/sysinst: bsddisklabel.c disks.c Log Message: Skip unwanted (zero sized) partitions. To generate a diff of this commit: cvs rdiff -u -r1.27 -r1.28 src/usr.sbin/sysinst/bsddisklabel.c cvs rdiff -u -r1.52 -r1.53 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.27 src/usr.sbin/sysinst/bsddisklabel.c:1.28 --- src/usr.sbin/sysinst/bsddisklabel.c:1.27 Wed Aug 28 15:19:05 2019 +++ src/usr.sbin/sysinst/bsddisklabel.c Mon Oct 21 16:10:54 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: bsddisklabel.c,v 1.27 2019/08/28 15:19:05 martin Exp $ */ +/* $NetBSD: bsddisklabel.c,v 1.28 2019/10/21 16:10:54 martin 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.52 src/usr.sbin/sysinst/disks.c:1.53 --- src/usr.sbin/sysinst/disks.c:1.52 Mon Oct 21 14:07:42 2019 +++ src/usr.sbin/sysinst/disks.c Mon Oct 21 16:10:54 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.52 2019/10/21 14:07:42 martin Exp $ */ +/* $NetBSD: disks.c,v 1.53 2019/10/21 16:10:54 martin 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;