From d0dded5d9fbc2ce963c095f230688e7ba4b0f465 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Thu, 26 Sep 2013 16:27:08 -0700 Subject: [PATCH 1/2] feat(coreos-init): enable docker --- ...coreos-init-0.0.1-r23.ebuild => coreos-init-0.0.1-r24.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-0.0.1.ebuild | 1 + .../coreos-base/coreos-init/coreos-init-9999.ebuild | 1 + 3 files changed, 2 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r23.ebuild => coreos-init-0.0.1-r24.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r23.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r24.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r23.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r24.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild index 4d3483968c..d96b45b52f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild @@ -48,4 +48,5 @@ src_install() { systemd_enable_service default.target sshd-keygen.service systemd_enable_service default.target sshd.socket systemd_enable_service default.target ssh-key-proc-cmdline.service + systemd_enable_service default.target docker.service } diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 49d1b3b79d..2cb98bea12 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -47,4 +47,5 @@ src_install() { systemd_enable_service default.target sshd-keygen.service systemd_enable_service default.target sshd.socket systemd_enable_service default.target ssh-key-proc-cmdline.service + systemd_enable_service default.target docker.service } From 4765674707a6d4d9467daef75053d36c90425577 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Sat, 28 Sep 2013 15:16:42 -0700 Subject: [PATCH 2/2] fix(coreos-base/coreos-init): aactually link in docker linking in the docker unit didn't work because coreos-init didn't depend on docker. Fix that! --- ...coreos-init-0.0.1-r24.ebuild => coreos-init-0.0.1-r25.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-0.0.1.ebuild | 1 + 2 files changed, 1 insertion(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r24.ebuild => coreos-init-0.0.1-r25.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r24.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r25.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r24.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r25.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild index d96b45b52f..fb0b6ae561 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1.ebuild @@ -21,6 +21,7 @@ IUSE="test" # Daemons we enable here must installed during build/install in addition to # during runtime so the systemd unit enable step works. DEPEND=" + app-emulation/docker net-misc/dhcpcd net-misc/openssh !