Procházet zdrojové kódy

Merge pull request #24558 from clnperez/systemd-hack-redo

Uncomment the TasksMax val later in the deb build
Tibor Vass před 9 roky
rodič
revize
8a405461b0
1 změnil soubory, kde provedl 6 přidání a 0 odebrání
  1. 6 0
      hack/make/.build-deb/rules

+ 6 - 0
hack/make/.build-deb/rules

@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 #!/usr/bin/make -f
 
 
 VERSION = $(shell cat VERSION)
 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:
 override_dh_gencontrol:
 	# if we're on Ubuntu, we need to Recommends: apparmor
 	# if we're on Ubuntu, we need to Recommends: apparmor
@@ -32,6 +34,10 @@ override_dh_auto_install:
 override_dh_installinit:
 override_dh_installinit:
 	# use "docker" as our service name, not "docker-engine"
 	# use "docker" as our service name, not "docker-engine"
 	dh_installinit --name=docker
 	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:
 override_dh_installudev:
 	# match our existing priority
 	# match our existing priority