From f400840b85cc3c87221128e9b1d997a8c8f96dc2 Mon Sep 17 00:00:00 2001 From: David Sissitka Date: Thu, 26 Sep 2013 12:52:43 -0700 Subject: [PATCH 1/2] Configured FPM to make /etc/init/docker.conf a config file. Upstream-commit: f8c9f11f067ef94a35cbc35b8d15f67d57ce1aec Component: engine --- components/engine/hack/make/ubuntu | 2 ++ 1 file changed, 2 insertions(+) diff --git a/components/engine/hack/make/ubuntu b/components/engine/hack/make/ubuntu index 772fa91385..527edfe4be 100644 --- a/components/engine/hack/make/ubuntu +++ b/components/engine/hack/make/ubuntu @@ -79,6 +79,7 @@ EOF --replaces lxc-docker-virtual-package \ --url "$PACKAGE_URL" \ --vendor "$PACKAGE_VENDOR" \ + --config-files /etc/init/docker.conf \ -t deb . mkdir empty fpm -s dir -C empty \ @@ -89,6 +90,7 @@ EOF --maintainer "$PACKAGE_MAINTAINER" \ --url "$PACKAGE_URL" \ --vendor "$PACKAGE_VENDOR" \ + --config-files /etc/init/docker.conf \ -t deb . ) } From 6693d06bc79bb969796a469b593ecc9454b73ba0 Mon Sep 17 00:00:00 2001 From: David Sissitka Date: Thu, 26 Sep 2013 13:56:59 -0700 Subject: [PATCH 2/2] Used tabs for alignment when I should've used spaces. Fixed. Upstream-commit: c22e377a6d36816210803e34e4d73cf45a4aa828 Component: engine --- components/engine/hack/make/ubuntu | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/components/engine/hack/make/ubuntu b/components/engine/hack/make/ubuntu index 527edfe4be..23e02ab193 100644 --- a/components/engine/hack/make/ubuntu +++ b/components/engine/hack/make/ubuntu @@ -79,7 +79,7 @@ EOF --replaces lxc-docker-virtual-package \ --url "$PACKAGE_URL" \ --vendor "$PACKAGE_VENDOR" \ - --config-files /etc/init/docker.conf \ + --config-files /etc/init/docker.conf \ -t deb . mkdir empty fpm -s dir -C empty \ @@ -90,7 +90,7 @@ EOF --maintainer "$PACKAGE_MAINTAINER" \ --url "$PACKAGE_URL" \ --vendor "$PACKAGE_VENDOR" \ - --config-files /etc/init/docker.conf \ + --config-files /etc/init/docker.conf \ -t deb . ) }