From 99aacd9351626530bc4d4c7867bbeec8a5784d86 Mon Sep 17 00:00:00 2001 From: David Michael Date: Wed, 7 Dec 2016 11:52:36 -0800 Subject: [PATCH] app-emulation/docker: configure nspawn before disabling veths --- .../{docker-1.12.3-r2.ebuild => docker-1.12.3-r3.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 3 ++- .../files/{50-docker-veth.network => 90-docker-veth.network} | 0 3 files changed, 2 insertions(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.12.3-r2.ebuild => docker-1.12.3-r3.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/{50-docker-veth.network => 90-docker-veth.network} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.12.3-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild index cab3110c36..7b74595e56 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-9999.ebuild @@ -286,7 +286,8 @@ src_install() { systemd_dounit "${FILESDIR}/early-docker.target" insinto /usr/lib/systemd/network - doins "${FILESDIR}"/50-docker{,-veth}.network + doins "${FILESDIR}"/50-docker.network + doins "${FILESDIR}"/90-docker-veth.network udev_dorules contrib/udev/*.rules diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/90-docker-veth.network similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/50-docker-veth.network rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/90-docker-veth.network