[src/netbsd-9]: src/usr.sbin/sysinst Pull up following revision(s) (requested...

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

details:   https://anonhg.NetBSD.org/src/rev/5d80954e12ff
branches:  netbsd-9
changeset: 962777:5d80954e12ff
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Fri Aug 09 06:21:00 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #33):
        usr.sbin/sysinst/disks.c: revision 1.50
Do not even consider to fsck partitions where we do not know the file
system type. Add v7fs support.

diffstat:

 usr.sbin/sysinst/disks.c |  13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diffs (48 lines):

diff -r 0d1760214444 -r 5d80954e12ff usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Fri Aug 09 06:20:12 2019 +0000
+++ b/usr.sbin/sysinst/disks.c  Fri Aug 09 06:21:00 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.44.2.5 2019/08/09 06:20:12 msaitoh Exp $ */
+/*     $NetBSD: disks.c,v 1.44.2.6 2019/08/09 06:21:00 msaitoh Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1121,6 +1121,8 @@
                 */
                ptn = &install->infos[i];
                parts = ptn->parts;
+               newfs = NULL;
+               fsname = NULL;
 
                if (ptn->size == 0 || parts == NULL|| ptn->type == PT_swap)
                        continue;                       
@@ -1136,7 +1138,6 @@
                parts->pscheme->get_part_device(parts, ptn->cur_part_id,
                    rdev, sizeof rdev, &partno, raw_dev_name, true);
 
-               newfs = NULL;
                switch (ptn->fs_type) {
                case FS_APPLEUFS:
                        asprintf(&newfs, "/sbin/newfs");
@@ -1168,6 +1169,11 @@
                        mnt_opts = "-tsysvbfs";
                        fsname = "sysvbfs";
                        break;
+               case FS_V7:
+                       asprintf(&newfs, "/sbin/newfs_v7fs");
+                       mnt_opts = "-tv7fs";
+                       fsname = "v7fs";
+                       break;
                case FS_EX2FS:
                        asprintf(&newfs, "/sbin/newfs_ext2fs");
                        mnt_opts = "-text2fs";
@@ -1192,7 +1198,8 @@
                                error = run_program(RUN_DISPLAY | RUN_PROGRESS,
                            "%s %s", newfs, rdev);
                        }
-               } else if (ptn->instflags & (PUIINST_MOUNT|PUIINST_BOOT)) {
+               } else if ((ptn->instflags & (PUIINST_MOUNT|PUIINST_BOOT))
+                   && fsname != NULL) {
                        /* We'd better check it isn't dirty */
                        error = fsck_preen(devdev, fsname, false);
                }