[src/trunk]: src/usr.sbin/sysinst Minor fix to previous: fix condition when w...

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

details:   https://anonhg.NetBSD.org/src/rev/b9d973d311ed
branches:  trunk
changeset: 940649:b9d973d311ed
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Oct 12 16:27:23 2020 +0000

description:
Minor fix to previous: fix condition when we offer the partition type
switch - it makes sense even if the disk is partitioned but has no valid
partitions.

diffstat:

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

diffs (52 lines):

diff -r a23b4472c412 -r b9d973d311ed usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Mon Oct 12 16:14:32 2020 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Mon Oct 12 16:27:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.52 2020/10/12 16:14:32 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.53 2020/10/12 16:27:23 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -840,7 +840,7 @@
        opt++;
        num_opts++;
 
-       if (have_existing && num_available_part_schemes > 1 &&
+       if (num_available_part_schemes > 1 &&
            parts->parent == NULL) {
                opt->opt_name = MSG_Use_Different_Part_Scheme;
                opt->opt_flags = OPT_EXIT;
diff -r a23b4472c412 -r b9d973d311ed usr.sbin/sysinst/part_edit.c
--- a/usr.sbin/sysinst/part_edit.c      Mon Oct 12 16:14:32 2020 +0000
+++ b/usr.sbin/sysinst/part_edit.c      Mon Oct 12 16:27:23 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: part_edit.c,v 1.23 2020/10/12 16:14:32 martin Exp $ */
+/*     $NetBSD: part_edit.c,v 1.24 2020/10/12 16:27:23 martin Exp $ */
 
 /*
  * Copyright (c) 2019 The NetBSD Foundation, Inc.
@@ -1054,7 +1054,6 @@
        size_t num_opts;
        menu_ent options[4], *opt;
        daddr_t start, size;
-       bool have_existing = false;
 
        args[0] = msg_string(pm->parts->pscheme->name);
        args[1] = msg_string(pm->parts->pscheme->short_name);
@@ -1072,7 +1071,6 @@
                opt->opt_action = set_keep_existing;
                opt++;
                num_opts++;
-               have_existing = true;
        }
        opt->opt_name = MSG_Use_only_part_of_the_disk;
        opt->opt_flags = OPT_EXIT;
@@ -1086,7 +1084,7 @@
        opt++;
        num_opts++;
 
-       if (have_existing && num_available_part_schemes > 1) {
+       if (num_available_part_schemes > 1) {
                opt->opt_name = MSG_Use_Different_Part_Scheme;
                opt->opt_flags = OPT_EXIT;
                opt->opt_action = set_switch_scheme;