From 96c907429e3224289fd360b8d9c8fdc573f4363b Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Sat, 14 Jun 2014 15:38:35 +0200 Subject: networkd: netdev - allow setting MACAddress in .netdev files It may sometimes be necessary to specify the MAC address of a netdev. Let us set the correct one from the get-go, rather than having the kernel generate a random one, and then change it after. --- src/network/networkd-veth.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) (limited to 'src/network/networkd-veth.c') diff --git a/src/network/networkd-veth.c b/src/network/networkd-veth.c index 1a5d880ac2..3584981cbc 100644 --- a/src/network/networkd-veth.c +++ b/src/network/networkd-veth.c @@ -42,6 +42,16 @@ static int netdev_fill_veth_rtnl_message(NetDev *netdev, sd_rtnl_message *m) { return r; } + if (netdev->mac) { + r = sd_rtnl_message_append_ether_addr(m, IFLA_ADDRESS, netdev->mac); + if (r < 0) { + log_error_netdev(netdev, + "Colud not append IFLA_ADDRESS attribute: %s", + strerror(-r)); + return r; + } + } + r = sd_rtnl_message_open_container(m, IFLA_LINKINFO); if (r < 0) { log_error_netdev(netdev, @@ -67,7 +77,7 @@ static int netdev_fill_veth_rtnl_message(NetDev *netdev, sd_rtnl_message *m) { return r; } - if(netdev->ifname_peer) { + if (netdev->ifname_peer) { r = sd_rtnl_message_append_string(m, IFLA_IFNAME, netdev->ifname_peer); if (r < 0) { log_error("Failed to add netlink interface name: %s", strerror(-r)); @@ -75,6 +85,16 @@ static int netdev_fill_veth_rtnl_message(NetDev *netdev, sd_rtnl_message *m) { } } + if (netdev->mac_peer) { + r = sd_rtnl_message_append_ether_addr(m, IFLA_ADDRESS, netdev->mac_peer); + if (r < 0) { + log_error_netdev(netdev, + "Colud not append IFLA_ADDRESS attribute: %s", + strerror(-r)); + return r; + } + } + r = sd_rtnl_message_close_container(m); if (r < 0) { log_error_netdev(netdev, -- cgit v1.2.3-54-g00ecf