1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
Author: Tianon Gravi <admwiggin@gmail.com>
Description: remove convenience copies of cgroupfs-mount in init.d / upstart
Forwarded: not-needed
Bug-Debian: https://bugs.debian.org/783143
--- a/engine/contrib/init/sysvinit-debian/docker
+++ b/engine/contrib/init/sysvinit-debian/docker
@@ -58,39 +58,14 @@
exit 1
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"
ulimit -n 1048576
--- a/engine/contrib/init/upstart/docker.conf
+++ b/engine/contrib/init/upstart/docker.conf
@@ -12,31 +12,8 @@
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
DOCKER_OPTS=
|
