From 5819988ac73e302ef9dde499720e2a083cddfc86 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 25 Sep 2017 14:49:43 +0200 Subject: platform: cleanup logging for adding link No need for duplicate log lines [1506146476.8462] platform: link: adding tap tap0 owner 107 group -1 [1506146476.8462] platform-linux: link: add tap tap0 owner 107 group -1 Merge them. Also, for consistency change the logging output for adding generic interfaces in nm_platform_link_add(). --- src/platform/nm-linux-platform.c | 3 --- src/platform/nm-platform.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/platform/nm-linux-platform.c b/src/platform/nm-linux-platform.c index 003df4e950..1edc2183bb 100644 --- a/src/platform/nm-linux-platform.c +++ b/src/platform/nm-linux-platform.c @@ -5493,9 +5493,6 @@ tun_add (NMPlatform *platform, const char *name, gboolean tap, struct ifreq ifr = { }; int fd; - _LOGD ("link: add %s '%s' owner %" G_GINT64_FORMAT " group %" G_GINT64_FORMAT, - tap ? "tap" : "tun", name, owner, group); - fd = open ("/dev/net/tun", O_RDWR | O_CLOEXEC); if (fd < 0) return FALSE; diff --git a/src/platform/nm-platform.c b/src/platform/nm-platform.c index 73cf1c553c..686943a13f 100644 --- a/src/platform/nm-platform.c +++ b/src/platform/nm-platform.c @@ -856,7 +856,7 @@ nm_platform_link_add (NMPlatform *self, if (plerr != NM_PLATFORM_ERROR_SUCCESS) return plerr; - _LOGD ("link: add link '%s' of type '%s' (%d)" + _LOGD ("link: adding link '%s' of type '%s' (%d)" "%s%s" /* address */ "%s%s" /* veth peer */ "", -- cgit v1.2.1