networkctl: increase column width for link type to 18, to accomodate for 'ieee80211_r...

[elogind.git] / src / network / networkctl.c

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 8e021888843ceee73c69dd2abc73dec82571ee8b..620bc46b8fb8eb6fc7ab8b633a1833027c16a03b 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -215,7 +215,7 @@ static int list_links(char **args, unsigned n) {
         }
 
         if (arg_legend)
-                printf("%3s %-16s %-10s %-11s %-10s\n", "IDX", "LINK", "TYPE", "OPERATIONAL", "SETUP");
+                printf("%3s %-16s %-18s %-11s %-10s\n", "IDX", "LINK", "TYPE", "OPERATIONAL", "SETUP");
 
         c = decode_and_sort_links(reply, &links);
         if (c < 0)
@@ -240,7 +240,7 @@ static int list_links(char **args, unsigned n) {
 
                 link_get_type_string(links[i].iftype, d, &t);
 
-                printf("%3i %-16s %-10s %s%-11s%s %s%-10s%s\n",
+                printf("%3i %-16s %-18s %s%-11s%s %s%-10s%s\n",
                        links[i].ifindex, links[i].name, strna(t),
                        on_color_operational, strna(operational_state), off_color_operational,
                        on_color_setup, strna(setup_state), off_color_setup);
@@ -288,7 +288,7 @@ static void dump_list(const char *prefix, char **l) {
 }
 
 static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
-        _cleanup_strv_free_ char **dns = NULL, **ntp = NULL;
+        _cleanup_strv_free_ char **dns = NULL, **ntp = NULL, **domains = NULL;
         _cleanup_free_ char *setup_state = NULL, *operational_state = NULL;
         _cleanup_rtnl_message_unref_ sd_rtnl_message *req = NULL, *reply = NULL;
         _cleanup_udev_device_unref_ struct udev_device *d = NULL;
@@ -364,6 +364,7 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
 
         sd_network_link_get_dns(ifindex, &dns);
         sd_network_link_get_ntp(ifindex, &ntp);
+        sd_network_link_get_domains(ifindex, &domains);
 
         sprintf(devid, "n%i", ifindex);
         d = udev_device_new_from_device_id(udev, devid);
@@ -411,6 +412,8 @@ static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
 
         if (!strv_isempty(dns))
                 dump_list("         DNS: ", dns);
+        if (!strv_isempty(domains))
+                dump_list("     Domains: ", domains);
         if (!strv_isempty(ntp))
                 dump_list("         NTP: ", ntp);