Module Name: src
Committed By: martin
Date: Sat Aug 3 12:09:22 UTC 2019
Modified Files:
src/usr.sbin/sysinst: disks.c
Log Message:
Properly handle partitions that we were requested to mount but not newfs.
To generate a diff of this commit:
cvs rdiff -u -r1.45 -r1.46 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/disks.c
diff -u src/usr.sbin/sysinst/disks.c:1.45 src/usr.sbin/sysinst/disks.c:1.46
--- src/usr.sbin/sysinst/disks.c:1.45 Thu Aug 1 16:32:06 2019
+++ src/usr.sbin/sysinst/disks.c Sat Aug 3 12:09:22 2019
@@ -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_partitio
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);
