[src/trunk]: src/usr.sbin/sysinst Fix DISKLABEL_NO_ONDISK_VERIFY (accidently ...

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

details:   https://anonhg.NetBSD.org/src/rev/c2db3c5245ff
branches:  trunk
changeset: 847151:c2db3c5245ff
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Dec 12 19:29:05 2019 +0000

description:
Fix DISKLABEL_NO_ONDISK_VERIFY (accidently disabled in previous)

diffstat:

 usr.sbin/sysinst/disklabel.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (37 lines):

diff -r 1b242f81a977 -r c2db3c5245ff usr.sbin/sysinst/disklabel.c
--- a/usr.sbin/sysinst/disklabel.c      Thu Dec 12 16:49:20 2019 +0000
+++ b/usr.sbin/sysinst/disklabel.c      Thu Dec 12 19:29:05 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disklabel.c,v 1.19 2019/12/12 12:19:39 martin Exp $    */
+/*     $NetBSD: disklabel.c,v 1.20 2019/12/12 19:29:05 martin Exp $    */
 
 /*
  * Copyright 2018 The NetBSD Foundation, Inc.
@@ -170,10 +170,10 @@
        int fd;
        char diskpath[MAXPATHLEN];
        uint flags;
+#ifndef DISKLABEL_NO_ONDISK_VERIFY
        bool only_dl = only_have_disklabel();
        bool have_raw_label = false;
 
-#ifndef DISKLABEL_NO_ONDISK_VERIFY
        /*
         * Verify we really have a disklabel.
         */
@@ -266,6 +266,7 @@
        }
        close(fd);
 
+#ifndef DISKLABEL_NO_ONDISK_VERIFY
        if (!have_raw_label && only_dl) {
                bool found_real_part = false;
 
@@ -288,6 +289,7 @@
                        return NULL;
                }
        }
+#endif
 
        return &parts->dp;
 }