[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/5290c046bb0f
branches:  netbsd-9
changeset: 1000628:5290c046bb0f
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon Aug 05 04:38:47 2019 +0000

description:
Pull up following revision(s) (requested by martin in ticket #16):
        usr.sbin/sysinst/label.c: revision 1.12
Fix copy&pasto: when we find a FFSv1 filesystem, properly record it
that way - so the correct bootblocks get installed on system upgrades.

diffstat:

 usr.sbin/sysinst/label.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 2cf0fcd25b90 -r 5290c046bb0f usr.sbin/sysinst/label.c
--- a/usr.sbin/sysinst/label.c  Mon Aug 05 04:37:44 2019 +0000
+++ b/usr.sbin/sysinst/label.c  Mon Aug 05 04:38:47 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: label.c,v 1.10.2.1 2019/08/02 05:41:46 msaitoh Exp $   */
+/*     $NetBSD: label.c,v 1.10.2.2 2019/08/05 04:38:47 msaitoh Exp $   */
 
 /*
  * Copyright 1997 Jonathan Stone
@@ -36,7 +36,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: label.c,v 1.10.2.1 2019/08/02 05:41:46 msaitoh Exp $");
+__RCSID("$NetBSD: label.c,v 1.10.2.2 2019/08/05 04:38:47 msaitoh Exp $");
 #endif
 
 #include <sys/types.h>
@@ -1578,7 +1578,7 @@
                        if (fs_type)
                                *fs_type = FS_BSDFFS;
                        if (fs_sub_type)
-                               *fs_sub_type = 2;
+                               *fs_sub_type = 1;
                        continue;
                case FS_UFS2_MAGIC:
                case FS_UFS2_MAGIC_SWAPPED: