From 37744a633ec6e63642aa47ce00e7b050bede4ca0 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 12 Jun 2014 13:51:42 -0700 Subject: [PATCH] fix(sys-apps/systemd): Fix matching by MAC address --- ...ching-for-configs-in-alternate-roots.patch | 2 +- ...dhcp-client-Sets-broadcast-flag-to-1.patch | 2 +- ...-networkd-link-intialize-mac-address.patch | 33 +++++++++++++++++++ ...md-213-r1.ebuild => systemd-213-r2.ebuild} | 3 ++ 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0003-networkd-link-intialize-mac-address.patch rename sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/{systemd-213-r1.ebuild => systemd-213-r2.ebuild} (99%) diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0001-shared-fix-searching-for-configs-in-alternate-roots.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0001-shared-fix-searching-for-configs-in-alternate-roots.patch index 7e0eec65f6..df04ee96a1 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0001-shared-fix-searching-for-configs-in-alternate-roots.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0001-shared-fix-searching-for-configs-in-alternate-roots.patch @@ -1,7 +1,7 @@ From 58a08cac31af656c25532a075a1182f6b45217a7 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 29 May 2014 10:59:42 -0700 -Subject: [PATCH 1/2] shared: fix searching for configs in alternate roots +Subject: [PATCH 1/3] shared: fix searching for configs in alternate roots Commit 12ed81d9 changed path_strv_canonicalize_absolute's behavior to return a directory list without the root prefix if one was given but did diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0002-sd-dhcp-client-Sets-broadcast-flag-to-1.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0002-sd-dhcp-client-Sets-broadcast-flag-to-1.patch index c5e2da72c7..5c8460a6e8 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0002-sd-dhcp-client-Sets-broadcast-flag-to-1.patch +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0002-sd-dhcp-client-Sets-broadcast-flag-to-1.patch @@ -1,7 +1,7 @@ From fa51901447b24b4894da26a35a16596a90786429 Mon Sep 17 00:00:00 2001 From: Camilo Aguilar Date: Tue, 27 May 2014 23:05:14 -0400 -Subject: [PATCH 2/2] sd-dhcp-client: Sets broadcast flag to 1 +Subject: [PATCH 2/3] sd-dhcp-client: Sets broadcast flag to 1 In systems running on hypervisors this flag needs to be set ON, so offers can reach the virtual machines. diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0003-networkd-link-intialize-mac-address.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0003-networkd-link-intialize-mac-address.patch new file mode 100644 index 0000000000..376b1f11ef --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/213-0003-networkd-link-intialize-mac-address.patch @@ -0,0 +1,33 @@ +From 6a3cbd39d60bdb84f82b0a9b5a77ecb6769ee2db Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Wed, 4 Jun 2014 21:29:08 +0200 +Subject: [PATCH 3/3] networkd: link - intialize mac address + +Otherwise .netwrok matching on MAC address will not work. + +Based on patch by Dave Reisner, and bug originally reported by Max Pray. + +Conflicts: + src/network/networkd-link.c +--- + src/network/networkd-link.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c +index 6677b94..9afb871 100644 +--- a/src/network/networkd-link.c ++++ b/src/network/networkd-link.c +@@ -75,6 +75,10 @@ static int link_new(Manager *manager, sd_rtnl_message *message, Link **ret) { + if (!link->ifname) + return -ENOMEM; + ++ r = sd_rtnl_message_read_ether_addr(message, IFLA_ADDRESS, &link->mac); ++ if (r < 0) ++ return r; ++ + r = asprintf(&link->state_file, "/run/systemd/network/links/%"PRIu64, + link->ifindex); + if (r < 0) +-- +1.8.5.5 + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213-r2.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213-r1.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213-r2.ebuild index 09e8982199..19842a3433 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213-r1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-213-r2.ebuild @@ -117,6 +117,9 @@ fi # fix DHCP for VMware bridged network interfaces epatch "${FILESDIR}"/213-0002-sd-dhcp-client-Sets-broadcast-flag-to-1.patch + # fix matching interfaces by MAC address + epatch "${FILESDIR}"/213-0003-networkd-link-intialize-mac-address.patch + # Bug 463376 sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die