Skip to content

Commit

Permalink
Uncomment the TasksMax val later in the deb build
Browse files Browse the repository at this point in the history
The original sed placement was creating packages with an
"unsupported" tag in the package name.

Fixes moby#24197

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
  • Loading branch information
clnperez committed Jul 12, 2016
1 parent 534c3e3 commit dab2878
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions hack/make/.build-deb/rules
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit dab2878

Please sign in to comment.