Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip unwanted (zero sized) partitions.

This commit is contained in:
martin 2019-10-21 16:10:54 +00:00
parent 10ffbb5073
commit e1c382678c
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/sysinst/bsddisklabel.c
View File

@ -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_devs *p, struct disk_partitions *parts,
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;

5
usr.sbin/sysinst/disks.c
View File

@ -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 *install)
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;