[src/trunk]: src/usr.sbin/sysinst Temporarily back out rev 1.66 and switch th...

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

details:   https://anonhg.NetBSD.org/src/rev/06c44f6fbf7e
branches:  trunk
changeset: 372643:06c44f6fbf7e
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Dec 15 15:11:44 2022 +0000

description:
Temporarily back out rev 1.66 and switch the default FFS type back to
FFSv2 (w/o ea) for the upcoming netbsd-10 branch.

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (39 lines):

diff -r e10e752e2cb8 -r 06c44f6fbf7e usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Thu Dec 15 14:54:27 2022 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Thu Dec 15 15:11:44 2022 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.67 2022/12/09 16:54:31 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.68 2022/12/15 15:11:44 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -144,9 +144,9 @@
          .flags = PUIFLG_JUST_MOUNTPOINT },
 #endif
        { .def_size = DEFUSRSIZE*(MEG/512), .mount = "/usr", .type = PT_root,
-         .fs_type = FS_BSDFFS, .fs_version = 3 },
+         .fs_type = FS_BSDFFS, .fs_version = 2 },
        { .def_size = DEFVARSIZE*(MEG/512), .mount = "/var", .type = PT_root,
-         .fs_type = FS_BSDFFS, .fs_version = 3 },
+         .fs_type = FS_BSDFFS, .fs_version = 2 },
 };
 
 static const char size_separator[] =
@@ -366,7 +366,7 @@
        p->cur_part_id = NO_PART;
        p->type = PT_root;
        p->fs_type = FS_BSDFFS;
-       p->fs_version = 3;
+       p->fs_version = 2;
        strncpy(p->mount, new_mp, sizeof(p->mount));
 
        menu->cursel = pset->num;
@@ -1039,7 +1039,7 @@
 #ifndef HAVE_UFS2_BOOT
                                if (boot < wanted->num || i != root)
 #endif
-                                       wanted->infos[i].fs_version = 3;
+                                       wanted->infos[i].fs_version = 2;
 #endif
                        }
                }