From a8e7688bfa8c93ada26e290a168262ebf9d82e2a Mon Sep 17 00:00:00 2001 From: martin Date: Sat, 3 Aug 2019 12:09:22 +0000 Subject: [PATCH] Properly handle partitions that we were requested to mount but not newfs. --- usr.sbin/sysinst/disks.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/usr.sbin/sysinst/disks.c b/usr.sbin/sysinst/disks.c index 3d2380b3a91f..1e185a1c53d7 100644 --- a/usr.sbin/sysinst/disks.c +++ b/usr.sbin/sysinst/disks.c @@ -1,4 +1,4 @@ -/* $NetBSD: disks.c,v 1.45 2019/08/01 16:32:06 martin Exp $ */ +/* $NetBSD: disks.c,v 1.46 2019/08/03 12:09:22 martin Exp $ */ /* * Copyright 1997 Piermont Information Systems Inc. @@ -1112,17 +1112,14 @@ make_filesystems(struct install_partition_desc *install) ptn = &install->infos[i]; parts = ptn->parts; - if (ptn->size == 0 || parts == NULL) - continue; + if (ptn->size == 0 || parts == NULL|| ptn->type == PT_swap) + continue; if (parts->pscheme->get_part_device(parts, ptn->cur_part_id, devdev, sizeof devdev, &partno, parent_device_only, false) && is_active_rootpart(devdev, partno)) continue; - if (!(ptn->instflags & PUIINST_NEWFS)) - continue; - parts->pscheme->get_part_device(parts, ptn->cur_part_id, devdev, sizeof devdev, &partno, plain_name, true);