cgroupfs-mount-convenience-copy

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

diff --git a/contrib/init/sysvinit-debian/docker b/contrib/init/sysvinit-debian/docker
index 11500a0a5d70171c62c9dcd995d54206df9bad39..3ad9e2e1fc15975c0cf0a00424492845390d875e 100755 (executable)
--- a/contrib/init/sysvinit-debian/docker
+++ b/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/contrib/init/upstart/docker.conf b/contrib/init/upstart/docker.conf
index ec50b35a874b5b8f0a6ca64e01dbc7e24c535bd9..75858f87197eb2fe0596518208daf2bd3ecf69c6 100644 (file)
--- a/contrib/init/upstart/docker.conf
+++ b/contrib/init/upstart/docker.conf
@@ -9,29 +9,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)
        DOCKER=/usr/bin/$UPSTART_JOB