[src/trunk]: src/usr.sbin/sysinst PR 55377: mark boot partitions in the parti...

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

details:   https://anonhg.NetBSD.org/src/rev/aed1d16793ba
branches:  trunk
changeset: 939731:aed1d16793ba
user:      martin <martin%NetBSD.org@localhost>
date:      Mon Sep 28 18:13:25 2020 +0000

description:
PR 55377: mark boot partitions in the partition size display, as suggested
by Izumi Tsutsui (minor modifications + all bugs by me)

diffstat:

 usr.sbin/sysinst/bsddisklabel.c |  15 +++++++++++++--
 1 files changed, 13 insertions(+), 2 deletions(-)

diffs (36 lines):

diff -r ea2bb7c3a940 -r aed1d16793ba usr.sbin/sysinst/bsddisklabel.c
--- a/usr.sbin/sysinst/bsddisklabel.c   Mon Sep 28 16:27:47 2020 +0000
+++ b/usr.sbin/sysinst/bsddisklabel.c   Mon Sep 28 18:13:25 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bsddisklabel.c,v 1.43 2020/09/22 16:18:54 martin Exp $ */
+/*     $NetBSD: bsddisklabel.c,v 1.44 2020/09/28 18:13:25 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -260,7 +260,13 @@
                    pset->infos[opt].fs_version));
                mount = swap;
        } else if (pset->infos[opt].mount[0]) {
-               mount = pset->infos[opt].mount;
+               if (pset->infos[opt].instflags & PUIINST_BOOT) {
+                       snprintf(swap, sizeof swap, "%s <%s>",
+                           pset->infos[opt].mount, msg_string(MSG_ptn_boot));
+                       mount = swap;
+               } else {
+                       mount = pset->infos[opt].mount;
+               }
 #ifndef NO_CLONES
        } else if (pset->infos[opt].flags & PUIFLG_CLONE_PARTS) {
                snprintf(swap, sizeof swap, "%zu %s",
@@ -278,6 +284,11 @@
                if (mount == NULL)
                        mount = getfslabelname(pset->infos[opt].fs_type,
                            pset->infos[opt].fs_version);
+               if (pset->infos[opt].instflags & PUIINST_BOOT) {
+                       snprintf(swap, sizeof swap, "%s <%s>",
+                           mount, msg_string(MSG_ptn_boot));
+                       mount = swap;
+               }
                mount = str_arg_subst(msg_string(MSG_size_ptn_not_mounted),
                    1, &mount);
                free_mount = true;