diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild index f212cc7651..7d4861cc9e 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-gce/oem-gce-0.0.1.ebuild @@ -15,8 +15,6 @@ IUSE="" # no source directory S="${WORKDIR}" -RDEPEND="dev-lang/python" - src_install() { into "/" dobin ${FILESDIR}/gce-ssh-key diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/211-0001-sd-dhcp-client-accept-infinite-lease-lifetime.patch b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/211-0001-sd-dhcp-client-accept-infinite-lease-lifetime.patch new file mode 100644 index 0000000000..0750ed0cd2 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/files/211-0001-sd-dhcp-client-accept-infinite-lease-lifetime.patch @@ -0,0 +1,29 @@ +From 7bf2f4397255bc8f6cf20a0f2adab4c984ea7d14 Mon Sep 17 00:00:00 2001 +From: Tom Gundersen +Date: Wed, 19 Mar 2014 10:41:29 +0100 +Subject: [PATCH] sd-dhcp-client: accept infinite lease lifetime + +Otherwise we would fail with -EINVAL. Thanks to Brandon Philips +, for reporting the bug. +--- + src/libsystemd-network/sd-dhcp-client.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c +index 8411141..ce375dd 100644 +--- a/src/libsystemd-network/sd-dhcp-client.c ++++ b/src/libsystemd-network/sd-dhcp-client.c +@@ -747,6 +747,10 @@ static int client_set_lease_timeouts(sd_dhcp_client *client, uint64_t usec) { + assert(client); + assert(client->event); + ++ /* don't set timers for infinite leases */ ++ if (client->lease->lifetime == 0xffffffff) ++ return 0; ++ + if (client->lease->lifetime < 10) + return -EINVAL; + +-- +1.8.5.2 (Apple Git-48) + diff --git a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-211-r3.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-211-r4.ebuild similarity index 99% rename from sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-211-r3.ebuild rename to sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-211-r4.ebuild index 86c7980158..95a03f535c 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-211-r3.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-apps/systemd/systemd-211-r4.ebuild @@ -132,6 +132,9 @@ src_prepare() { # dns feature for more than one server epatch "${FILESDIR}"/211-networkd-allow-more-than-one-static-dns-server.patch + # patch to fix dhcp on gce + epatch "${FILESDIR}"/211-0001-sd-dhcp-client-accept-infinite-lease-lifetime.patch + if [[ ${PV} == *9999 ]]; then if use doc; then gtkdocize --docdir docs/ || die