Module Name: src
Committed By: msaitoh
Date: Mon Aug 5 04:36:42 UTC 2019
Modified Files:
src/usr.sbin/sysinst [netbsd-9]: disks.c
Log Message:
Pull up following revision(s) (requested by martin in ticket #14):
usr.sbin/sysinst/disks.c: revision 1.46
Properly handle partitions that we were requested to mount but not newfs.
To generate a diff of this commit:
cvs rdiff -u -r1.44.2.1 -r1.44.2.2 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.44.2.1 src/usr.sbin/sysinst/disks.c:1.44.2.2
--- src/usr.sbin/sysinst/disks.c:1.44.2.1 Fri Aug 2 05:41:46 2019
+++ src/usr.sbin/sysinst/disks.c Mon Aug 5 04:36:42 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: disks.c,v 1.44.2.1 2019/08/02 05:41:46 msaitoh Exp $ */
+/* $NetBSD: disks.c,v 1.44.2.2 2019/08/05 04:36:42 msaitoh 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);
