X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkctl.c;h=a2511fd566365bf1d96fa282c8976acccbc88c07;hp=3760de71dd2056762bb4af424ea40ae07fb4456e;hb=b1acce80cd60fe95f16df2f1ad23ff2ad82d08e5;hpb=1693a943ca581aca2beebb4c812ec6c9f17b8164 diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 3760de71d..a2511fd56 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -580,9 +580,6 @@ static int link_status_one( sprintf(devid, "n%i", ifindex); d = udev_device_new_from_device_id(udev, devid); - - link_get_type_string(iftype, d, &t); - if (d) { link = udev_device_get_property_value(d, "ID_NET_LINK_FILE"); driver = udev_device_get_property_value(d, "ID_NET_DRIVER"); @@ -597,6 +594,8 @@ static int link_status_one( model = udev_device_get_property_value(d, "ID_MODEL"); } + link_get_type_string(iftype, d, &t); + sd_network_link_get_network_file(ifindex, &network); printf("%s%s%s %i: %s\n", on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational, ifindex, name); @@ -676,7 +675,9 @@ static int link_status(char **args, unsigned n) { sd_network_get_operational_state(&operational_state); operational_state_to_color(operational_state, &on_color_operational, &off_color_operational); - printf(" State: %s%s%s\n", on_color_operational, strna(operational_state), off_color_operational); + printf("%s%s%s State: %s%s%s\n", + on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational, + on_color_operational, strna(operational_state), off_color_operational); dump_addresses(rtnl, " Address: ", 0); dump_gateways(rtnl, hwdb, " Gateway: ", 0);