X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Fncurses%2Fnc-config.c;h=0b42e4c971d09576afd101899d22d07a46537590;hp=4eeeff830aed783a67874bebab16f32a8ba047ed;hb=66bf929fa97fabb70198455f9eec2e9ccf0661fa;hpb=b7a7eb9a248f8afb1667b3e6675b49853e567ce1

diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c
index 4eeeff8..0b42e4c 100644
--- a/ui/ncurses/nc-config.c
+++ b/ui/ncurses/nc-config.c
@@ -15,7 +15,9 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#define _GNU_SOURCE
+#if defined(HAVE_CONFIG_H)
+#include "config.h"
+#endif
 
 #include <errno.h>
 #include <stdlib.h>
@@ -26,7 +28,6 @@
 #include <types/types.h>
 #include <log/log.h>
 
-#include "config.h"
 #include "nc-cui.h"
 #include "nc-config.h"
 #include "nc-widgets.h"
@@ -471,17 +472,22 @@ static void config_screen_setup_widgets(struct config_screen *screen,
 			config_screen_network_change, screen);
 
 	screen->widgets.iface_l = widget_new_label(set, 0, 0, "Device:");
-	screen->widgets.iface_f = widget_new_select(set, 0, 0, 20);
+	screen->widgets.iface_f = widget_new_select(set, 0, 0, 50);
 
 	for (i = 0; i < sysinfo->n_interfaces; i++) {
 		struct interface_info *info = sysinfo->interfaces[i];
+		char str[50], mac[20];
 		bool is_default;
 
 		is_default = ifcfg && !memcmp(ifcfg->hwaddr, info->hwaddr,
 					sizeof(ifcfg->hwaddr));
 
+		mac_str(info->hwaddr, info->hwaddr_size, mac, sizeof(mac));
+		snprintf(str, sizeof(str), "%s [%s, %s]", info->name, mac,
+				info->link ? "link up" : "link down");
+
 		widget_select_add_option(screen->widgets.iface_f,
-						i, info->name, is_default);
+						i, str, is_default);
 	}
 
 	gw = ip = mask = NULL;