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 (parent:
d95b83b
)
networkctl: show the link file applied to each link
author
Tom Gundersen
<teg@jklm.no>
Mon, 8 Sep 2014 12:18:32 +0000
(14:18 +0200)
committer
Tom Gundersen
<teg@jklm.no>
Mon, 8 Sep 2014 13:09:08 +0000
(15:09 +0200)
src/network/networkctl.c
patch
|
blob
|
history
diff --git
a/src/network/networkctl.c
b/src/network/networkctl.c
index 43258bb942538be3568eb6efd59f4ae2bd77666d..b374121fbc8d80cbe84beb2a5f33b6da417c2331 100644
(file)
--- a/
src/network/networkctl.c
+++ b/
src/network/networkctl.c
@@
-295,7
+295,7
@@
static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL, *network = NULL;
_cleanup_udev_device_unref_ struct udev_device *d = NULL;
char devid[2 + DECIMAL_STR_MAX(int)];
_cleanup_free_ char *t = NULL, *network = NULL;
- const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL;
+ const char *driver = NULL, *path = NULL, *vendor = NULL, *model = NULL
, *link = NULL
;
const char *on_color_operational, *off_color_operational,
*on_color_setup, *off_color_setup;
struct ether_addr e;
const char *on_color_operational, *off_color_operational,
*on_color_setup, *off_color_setup;
struct ether_addr e;
@@
-384,6
+384,7
@@
static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
link_get_type_string(iftype, d, &t);
if (d) {
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");
path = udev_device_get_property_value(d, "ID_PATH");
driver = udev_device_get_property_value(d, "ID_NET_DRIVER");
path = udev_device_get_property_value(d, "ID_PATH");
@@
-400,9
+401,11
@@
static int link_status_one(sd_rtnl *rtnl, struct udev *udev, const char *name) {
printf("%s%s%s %i: %s\n", on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational, ifindex, name);
printf("%s%s%s %i: %s\n", on_color_operational, draw_special_char(DRAW_BLACK_CIRCLE), off_color_operational, ifindex, name);
- printf("Network File: %s\n"
+ printf(" Link File: %s\n"
+ "Network File: %s\n"
" Type: %s\n"
" State: %s%s%s (%s%s%s)\n",
" Type: %s\n"
" State: %s%s%s (%s%s%s)\n",
+ strna(link),
strna(network),
strna(t),
on_color_operational, strna(operational_state), off_color_operational,
strna(network),
strna(t),
on_color_operational, strna(operational_state), off_color_operational,