From dab287819a21ef8755d2f1b578ebeea33eb4e784 Mon Sep 17 00:00:00 2001 From: Christy Perez Date: Thu, 30 Jun 2016 15:33:21 -0500 Subject: [PATCH] Uncomment the TasksMax val later in the deb build The original sed placement was creating packages with an "unsupported" tag in the package name. Fixes #24197 Signed-off-by: Christy Perez --- hack/make/.build-deb/rules | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/hack/make/.build-deb/rules b/hack/make/.build-deb/rules index 2a4d6176ea..bd097c7619 100755 --- a/hack/make/.build-deb/rules +++ b/hack/make/.build-deb/rules @@ -1,6 +1,8 @@ #!/usr/bin/make -f VERSION = $(shell cat VERSION) +SYSTEMD_VERSION := $(shell dpkg-query -W -f='$${Version}\n' systemd | cut -d- -f1) +SYSTEMD_GT_227 := $(shell [ '$(SYSTEMD_VERSION)' ] && [ '$(SYSTEMD_VERSION)' -gt 227 ] && echo true ) override_dh_gencontrol: # if we're on Ubuntu, we need to Recommends: apparmor @@ -32,6 +34,10 @@ override_dh_auto_install: override_dh_installinit: # use "docker" as our service name, not "docker-engine" dh_installinit --name=docker +ifeq (true, $(SYSTEMD_GT_227)) + $(warning "Setting TasksMax=infinity") + sed -i -- 's/#TasksMax=infinity/TasksMax=infinity/' debian/docker-engine/lib/systemd/system/docker.service +endif override_dh_installudev: # match our existing priority