From: Susant Sahani <ssahani@gmail.com>
Date: Tue, 14 May 2019 09:45:23 +0000 (+0200)
Subject: networkd: do not generate MAC for bridge device.
X-Git-Tag: archive/raspbian/241-7_deb10u6+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e1e596874ee1bf7635c9015508fb0aee1bc7ccbf;p=systemd.git

networkd: do not generate MAC for bridge device.

closes https://github.com/systemd/systemd/issues/12558

(cherry picked from commit deb2cfa4c6885d448eb1f17e5ef1b139106b7e86)

Gbp-Pq: Name networkd-do-not-generate-MAC-for-bridge-device.patch
---

diff --git a/src/network/netdev/netdev.c b/src/network/netdev/netdev.c
index ecd6cf41..6ef1631e 100644
--- a/src/network/netdev/netdev.c
+++ b/src/network/netdev/netdev.c
@@ -720,7 +720,7 @@ int netdev_load_one(Manager *manager, const char *filename) {
         if (!netdev->filename)
                 return log_oom();
 
-        if (!netdev->mac && netdev->kind != NETDEV_KIND_VLAN) {
+        if (!netdev->mac && !IN_SET(netdev->kind, NETDEV_KIND_VLAN, NETDEV_KIND_BRIDGE)) {
                 r = netdev_get_mac(netdev->ifname, &netdev->mac);
                 if (r < 0)
                         return log_error_errno(r, "Failed to generate predictable MAC address for %s: %m", netdev->ifname);