debian-cgroupfs-mount-convenience-copy

Gbp-Pq: Name debian-cgroupfs-mount-convenience-copy.patch

diff --git a/engine/contrib/init/sysvinit-debian/docker b/engine/contrib/init/sysvinit-debian/docker
index 4d7cbd7cdc41b5deec56d53b8031f7bdaaf01221..c83fe4921656dbf469d019802dbd6e39c14c43c9 100755 (executable)
--- 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 71978b6c74580b36a8078a26de433fd86ce2feba..0a27400e013c3ad88ba7276fd6461a4bba7b1474 100644 (file)
--- 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/sbin/dockerd