chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
1693a94
)
networkctl: also draw a nice unicode cirlce when "networkctl status" is run without...
author
Lennart Poettering
<lennart@poettering.net>
Fri, 12 Dec 2014 18:11:35 +0000
(19:11 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Fri, 12 Dec 2014 18:11:35 +0000
(19:11 +0100)
src/network/networkctl.c
patch
|
blob
|
history
diff --git
a/src/network/networkctl.c
b/src/network/networkctl.c
index 3760de71dd2056762bb4af424ea40ae07fb4456e..a2511fd566365bf1d96fa282c8976acccbc88c07 100644
(file)
--- 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);
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");
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");
}
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);
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);
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);
dump_addresses(rtnl, " Address: ", 0);
dump_gateways(rtnl, hwdb, " Gateway: ", 0);