From e727f38edafc02c22fc053cccf7734fed18259f2 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 23 Feb 2016 16:56:17 -0800 Subject: [PATCH] docker: change cgroup default back to systemd --- .../docker/{docker-1.10.1.ebuild => docker-1.10.1-r1.ebuild} | 0 .../coreos-overlay/app-emulation/docker/docker-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.10.1.ebuild => docker-1.10.1-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.1.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.1-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.1.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.10.1-r1.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 587a3d954f..59dbfb64fc 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 @@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]]; then DOCKER_GITCOMMIT="unknown" KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="88b8b3acc0edbf83ee19acb8d27bf3e54990dea7" # v1.10.1 + overlay fixes + CROS_WORKON_COMMIT="ef9fd5409bce282db61dab24c724a9a6fa2550e2" # v1.10.1 + overlay and cgroup fixes DOCKER_GITCOMMIT="${CROS_WORKON_COMMIT:0:7}" KEYWORDS="amd64" fi