From 48ec2cee628be26889cb8e4009ef5bc76d43cb3a Mon Sep 17 00:00:00 2001
From: Dmitry Smirnov <onlyjob@debian.org>
Date: Sun, 16 Sep 2018 04:21:33 +0100
Subject: [PATCH] cgroupfs-mount-convenience-copy

Gbp-Pq: Name cgroupfs-mount-convenience-copy.patch
---
 engine/contrib/init/sysvinit-debian/docker | 25 ----------------------
 engine/contrib/init/upstart/docker.conf    | 23 --------------------
 2 files changed, 48 deletions(-)

diff --git a/engine/contrib/init/sysvinit-debian/docker b/engine/contrib/init/sysvinit-debian/docker
index 9c8fa6be..d5e0b4c7 100755
--- a/engine/contrib/init/sysvinit-debian/docker
+++ b/engine/contrib/init/sysvinit-debian/docker
@@ -59,37 +59,12 @@ fail_unless_root() {
 	fi
 }
 
-cgroupfs_mount() {
-	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
-	if grep -v '^#' /etc/fstab | grep -q cgroup \
-		|| [ ! -e /proc/cgroups ] \
-		|| [ ! -d /sys/fs/cgroup ]; then
-		return
-	fi
-	if ! mountpoint -q /sys/fs/cgroup; then
-		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	fi
-	(
-		cd /sys/fs/cgroup
-		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-			mkdir -p $sys
-			if ! mountpoint -q $sys; then
-				if ! mount -n -t cgroup -o $sys cgroup $sys; then
-					rmdir $sys || true
-				fi
-			fi
-		done
-	)
-}
-
 case "$1" in
 	start)
 		check_init
 		
 		fail_unless_root
 
-		cgroupfs_mount
-
 		touch "$DOCKER_LOGFILE"
 		chgrp docker "$DOCKER_LOGFILE"
 
diff --git a/engine/contrib/init/upstart/docker.conf b/engine/contrib/init/upstart/docker.conf
index d58f7d6a..0de80659 100644
--- a/engine/contrib/init/upstart/docker.conf
+++ b/engine/contrib/init/upstart/docker.conf
@@ -13,29 +13,6 @@ respawn
 
 kill timeout 20
 
-pre-start script
-	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
-	if grep -v '^#' /etc/fstab | grep -q cgroup \
-		|| [ ! -e /proc/cgroups ] \
-		|| [ ! -d /sys/fs/cgroup ]; then
-		exit 0
-	fi
-	if ! mountpoint -q /sys/fs/cgroup; then
-		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	fi
-	(
-		cd /sys/fs/cgroup
-		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-			mkdir -p $sys
-			if ! mountpoint -q $sys; then
-				if ! mount -n -t cgroup -o $sys cgroup $sys; then
-					rmdir $sys || true
-				fi
-			fi
-		done
-	)
-end script
-
 script
 	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
 	DOCKERD=/usr/bin/dockerd
-- 
2.30.2