[src/trunk]: src/usr.sbin/sysinst Don't overwrite the filesystem type uncondi...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0d3c2b986453
branches:  trunk
changeset: 452584:0d3c2b986453
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Jul 15 19:13:05 2019 +0000

description:
Don't overwrite the filesystem type unconditionally with the FFSv1 or v2
setup for an architectures default - now we have /tmp on tmpfs back.

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diffs (29 lines):

diff -r 4e66de59f892 -r 0d3c2b986453 usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Mon Jul 15 17:17:59 2019 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Mon Jul 15 19:13:05 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.20 2019/07/14 11:26:18 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.21 2019/07/15 19:13:05 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1025,13 +1025,16 @@
                                else
                                        def_usr = i;
                        }
-                       wanted->infos[i].fs_type = FS_BSDFFS;
+                       if (wanted->infos[i].fs_type == FS_UNUSED)
+                               wanted->infos[i].fs_type = FS_BSDFFS;
+                       if (wanted->infos[i].fs_type == FS_BSDFFS) {
 #ifdef DEFAULT_UFS2
 #ifndef HAVE_UFS2_BOOT
-                       if (boot < wanted->num || i != root)
+                               if (boot < wanted->num || i != root)
 #endif
-                               wanted->infos[i].fs_version = 2;
+                                       wanted->infos[i].fs_version = 2;
 #endif
+                       }
                }
                if ((wanted->infos[i].flags & PUIFLG_JUST_MOUNTPOINT) &&
                    wanted->infos[i].size == 0)