ui/ncurses: Clear remaining space when drawing help line
[petitboot] / ui / ncurses / nc-sysinfo.c
index c01b35275ea6572bb0ad481673321f8712f124db..8252b4529586329fe99da95c06f04dfe50dbf281 100644 (file)
@@ -65,11 +65,11 @@ static void sysinfo_screen_populate(struct sysinfo_screen *screen,
        line("%-12s %s", _("System type:"), sysinfo->type ?: "");
        line("%-12s %s", _("System id:"),   sysinfo->identifier ?: "");
 
        line("%-12s %s", _("System type:"), sysinfo->type ?: "");
        line("%-12s %s", _("System id:"),   sysinfo->identifier ?: "");
 
-       if (sysinfo->n_current) {
+       if (sysinfo->n_primary) {
                line(NULL);
                line(NULL);
-               line("%s", _("Current platform versions:"));
-               for (i = 0; i < sysinfo->n_current; i++) {
-                       line("\t%s", sysinfo->platform_current[i] ?: "");
+               line("%s", _("Primary platform versions:"));
+               for (i = 0; i < sysinfo->n_primary; i++) {
+                       line("\t%s", sysinfo->platform_primary[i] ?: "");
                }
        }
 
                }
        }
 
@@ -81,6 +81,22 @@ static void sysinfo_screen_populate(struct sysinfo_screen *screen,
                }
        }
 
                }
        }
 
+       if (sysinfo->n_bmc_current) {
+               line(NULL);
+               line("%s", _("BMC current side:"));
+               for (i = 0; i < sysinfo->n_bmc_current; i++) {
+                       line("\t%s", sysinfo->bmc_current[i] ?: "");
+               }
+       }
+
+       if (sysinfo->n_bmc_golden) {
+               line(NULL);
+               line("%s", _("BMC golden side:"));
+               for (i = 0; i < sysinfo->n_bmc_golden; i++) {
+                       line("\t%s", sysinfo->bmc_golden[i] ?: "");
+               }
+       }
+
        if (sysinfo->n_blockdevs) {
                line(NULL);
                line(_("Storage devices"));
        if (sysinfo->n_blockdevs) {
                line(NULL);
                line(_("Storage devices"));
@@ -96,6 +112,7 @@ static void sysinfo_screen_populate(struct sysinfo_screen *screen,
        }
 
        if (sysinfo->bmc_mac) {
        }
 
        if (sysinfo->bmc_mac) {
+               line(NULL);
                mac_str(sysinfo->bmc_mac, HWADDR_SIZE, macbuf, sizeof(macbuf));
                line(_("Management (BMC) interface"));
                line(_(" MAC:  %s"), macbuf);
                mac_str(sysinfo->bmc_mac, HWADDR_SIZE, macbuf, sizeof(macbuf));
                line(_("Management (BMC) interface"));
                line(_(" MAC:  %s"), macbuf);
@@ -112,10 +129,11 @@ static void sysinfo_screen_populate(struct sysinfo_screen *screen,
                if_info_mac_str(info, macbuf, sizeof(macbuf));
 
                line("%s:", info->name);
                if_info_mac_str(info, macbuf, sizeof(macbuf));
 
                line("%s:", info->name);
-               line(_(" MAC:  %s"), macbuf);
+               line(_(" MAC:        %s"), macbuf);
+               line(_(" IP Address: %s"), info->address ?: _("none"));
                /* TRANSLATORS: these "up" / "down" strings refer to the
                 * link status for a network connection. */
                /* TRANSLATORS: these "up" / "down" strings refer to the
                 * link status for a network connection. */
-               line(_(" link: %s"), info->link ? _("up") : _("down"));
+               line(_(" link:       %s"), info->link ? _("up") : _("down"));
                line(NULL);
        }
 
                line(NULL);
        }