ui/ncurses: in lockdown ensure system reboot in ncurses menu exit

[petitboot] / ui / ncurses / nc-sysinfo.c

diff --git a/ui/ncurses/nc-sysinfo.c b/ui/ncurses/nc-sysinfo.c
index ca609cc8a5435cc81e346246cc908547f532b0c7..756f15dac14c4cf2dcf15f18f260c5371a9a55b4 100644 (file)
--- a/ui/ncurses/nc-sysinfo.c
+++ b/ui/ncurses/nc-sysinfo.c
@@ -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 ?: "");
 
-       if (sysinfo->n_current) {
+       if (sysinfo->n_primary) {
                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] ?: "");
                }
        }
 
@@ -112,6 +112,7 @@ static void sysinfo_screen_populate(struct sysinfo_screen *screen,
        }
 
        if (sysinfo->bmc_mac) {
+               line(NULL);
                mac_str(sysinfo->bmc_mac, HWADDR_SIZE, macbuf, sizeof(macbuf));
                line(_("Management (BMC) interface"));
                line(_(" MAC:  %s"), macbuf);
@@ -128,10 +129,14 @@ static void sysinfo_screen_populate(struct sysinfo_screen *screen,
                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"));
+               if (info->address_v6)
+                       line(_(" IPv6 Address: %s"),
+                                       info->address_v6 ?: _("none"));
                /* 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);
        }