From 4023637a8ab0654c1acd10d684ee13d0f95a18f5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 17 Dec 2019 12:32:36 +0100 Subject: [PATCH] Restore silent handling of BUS_ERROR_SPEED_METER_INACTIVE This only matters for the case where new networkctl is running against older networkd. We should still handle the old error to avoid unnecessary warning about speedmeeter being disabled. This partially reverts commit e813de549b17f2601750c95825d8e0740cbee38c. --- src/libsystemd/sd-bus/bus-common-errors.c | 1 + src/libsystemd/sd-bus/bus-common-errors.h | 1 + src/network/networkctl.c | 3 ++- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libsystemd/sd-bus/bus-common-errors.c b/src/libsystemd/sd-bus/bus-common-errors.c index 9ab3286cc9..4e23edd923 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.c +++ b/src/libsystemd/sd-bus/bus-common-errors.c @@ -102,6 +102,7 @@ BUS_ERROR_MAP_ELF_REGISTER const sd_bus_error_map bus_common_errors[] = { SD_BUS_ERROR_MAP(BUS_ERROR_NO_PRODUCT_UUID, EOPNOTSUPP), + SD_BUS_ERROR_MAP(BUS_ERROR_SPEED_METER_INACTIVE, EOPNOTSUPP), SD_BUS_ERROR_MAP(BUS_ERROR_UNMANAGED_INTERFACE, EOPNOTSUPP), SD_BUS_ERROR_MAP_END diff --git a/src/libsystemd/sd-bus/bus-common-errors.h b/src/libsystemd/sd-bus/bus-common-errors.h index 106bc159a6..8da56551f6 100644 --- a/src/libsystemd/sd-bus/bus-common-errors.h +++ b/src/libsystemd/sd-bus/bus-common-errors.h @@ -81,6 +81,7 @@ #define BUS_ERROR_NO_PRODUCT_UUID "org.freedesktop.hostname1.NoProductUUID" +#define BUS_ERROR_SPEED_METER_INACTIVE "org.freedesktop.network1.SpeedMeterInactive" #define BUS_ERROR_UNMANAGED_INTERFACE "org.freedesktop.network1.UnmanagedInterface" BUS_ERROR_MAP_ELF_USE(bus_common_errors); diff --git a/src/network/networkctl.c b/src/network/networkctl.c index 4197c09186..2f339c8c02 100644 --- a/src/network/networkctl.c +++ b/src/network/networkctl.c @@ -352,7 +352,8 @@ static int acquire_link_bitrates(sd_bus *bus, LinkInfo *link) { "org.freedesktop.network1.Link", "BitRates"); if (r < 0) { - bool quiet = sd_bus_error_has_name(&error, SD_BUS_ERROR_UNKNOWN_PROPERTY); + bool quiet = sd_bus_error_has_name(&error, SD_BUS_ERROR_UNKNOWN_PROPERTY) || + sd_bus_error_has_name(&error, BUS_ERROR_SPEED_METER_INACTIVE); return log_full_errno(quiet ? LOG_DEBUG : LOG_WARNING, r, "Failed to query link bit rates: %s", bus_error_message(&error, r)); -- 2.25.1