docker/docker-bin: 0.9.0-1 -> 0.9.0-2 -- Adds dependency on cgroupfs-mount

docker-bin/.md5sum

@@ -1,3 +1,3 @@
 f03ddc7a733a6653979a8395d5bc839a  docker-0.9.0
 966e1916d611427c44686ad09145996f  docker.conf
-eb65657b29dede7737d13c3c34b8f08d  docker.rc
+8a3c98f485270cda2b97155e5b2f624c  docker.rc

docker-bin/Pkgfile

@@ -2,11 +2,11 @@
 # URL:          http://www.docker.io/
 # Maintainer:   James Mills, prologic at shortcircuit dot net dot au
 #
-# Depends on:   bridge-utils sqlite3
+# Depends on:   bridge-utils sqlite3 cgroupfs-mount
 
 name=docker-bin
 version=0.9.0
-release=1
+release=2
 source=(
     https://get.docker.io/builds/Linux/x86_64/docker-$version
     docker.rc

docker-bin/docker.rc

@@ -12,17 +12,8 @@ start)
     chgrp docker /var/log/docker.log
     chown 640 /var/log/docker.log
 
-    # Ensure cgroups is properly mounted. (Taken from: https://github.com/dotcloud/docker/blob/v0.9.0/contrib/init/sysvinit-debian/docker#L57-L66)
-    if ! grep -q cgroup /proc/mounts; then
-        # rough approximation of cgroupfs-mount
-        mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-        for sys in $(cut -d'    ' -f1 /proc/cgroups); do
-            mkdir -p /sys/fs/cgroup/$sys
-            if ! mount -n -t cgroup -o $sys cgroup /sys/fs/cgroup/$sys 2>/dev/null; then
-                rmdir /sys/fs/cgroup/$sys 2>/dev/null || true
-            fi
-        done
-    fi
+    # Ensure cgroups is properly mounted.
+    cgroupfs-mount
 
     nohup /usr/bin/docker $DOCKER_OPTS > /var/log/docker.log 2>&1 &
     ;;
@@ -35,6 +26,9 @@ stop)
         killall -q /usr/bin/docker
         rm -f /var/run/docker.sock
     fi
+
+    # Unmount cgroups is
+    cgroupfs-ymount
     ;;
 restart)
     $0 stop

docker/.md5sum

@@ -1,3 +1,3 @@
 966e1916d611427c44686ad09145996f  docker.conf
-eb65657b29dede7737d13c3c34b8f08d  docker.rc
+8a3c98f485270cda2b97155e5b2f624c  docker.rc
 5969bb91ec4f17aa381831046fb15531  v0.9.0.tar.gz

docker/Pkgfile

@@ -2,12 +2,12 @@
 # URL:          http://www.docker.io/
 # Maintainer:   James Mills, prologic at shortcircuit dot net dot au
 #
-# Depends on:   go bridge-utils sqlite3
+# Depends on:   go bridge-utils sqlite3 cgroupfs-mount
 
 name=docker
 version=0.9.0
 revision=2b3fdf2344
-release=1
+release=2
 source=(
     https://github.com/dotcloud/$name/archive/v$version.tar.gz
     $name.rc

docker/docker.rc

@@ -12,17 +12,8 @@ start)
     chgrp docker /var/log/docker.log
     chown 640 /var/log/docker.log
 
-    # Ensure cgroups is properly mounted. (Taken from: https://github.com/dotcloud/docker/blob/v0.9.0/contrib/init/sysvinit-debian/docker#L57-L66)
-    if ! grep -q cgroup /proc/mounts; then
-        # rough approximation of cgroupfs-mount
-        mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-        for sys in $(cut -d'    ' -f1 /proc/cgroups); do
-            mkdir -p /sys/fs/cgroup/$sys
-            if ! mount -n -t cgroup -o $sys cgroup /sys/fs/cgroup/$sys 2>/dev/null; then
-                rmdir /sys/fs/cgroup/$sys 2>/dev/null || true
-            fi
-        done
-    fi
+    # Ensure cgroups is properly mounted.
+    cgroupfs-mount
 
     nohup /usr/bin/docker $DOCKER_OPTS > /var/log/docker.log 2>&1 &
     ;;
@@ -35,6 +26,9 @@ stop)
         killall -q /usr/bin/docker
         rm -f /var/run/docker.sock
     fi
+
+    # Unmount cgroups is
+    cgroupfs-ymount
     ;;
 restart)
     $0 stop