From a040bc7932e2a86400f10c7c12c66e0457662a8d Mon Sep 17 00:00:00 2001 From: Nick Owens Date: Sat, 21 Nov 2015 19:37:26 -0800 Subject: [PATCH] app-emulation/docker: do not pass empty argument when selinux is disabled in https://github.com/coreos/coreos-overlay/pull/1639, the script would set USE_SELINUX to the blank string, causing an extra blank argument to be passed to docker daemon, resulting in it not starting when docker runs on btrfs. --- .../docker/{docker-1.8.3-r2.ebuild => docker-1.8.3-r3.ebuild} | 0 .../coreos-overlay/app-emulation/docker/files/dockerd | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/docker/{docker-1.8.3-r2.ebuild => docker-1.8.3-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.3-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.3-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.3-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/docker/docker-1.8.3-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd index 566b8cdfa8..ac33563f8f 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/docker/files/dockerd @@ -79,4 +79,4 @@ fi USE_SELINUX="--selinux-enabled" maybe_disable_selinux -exec docker "$@" "${USE_SELINUX}" +exec docker "$@" ${USE_SELINUX}