Merge branch 'master' into 3618-column-ordering

[arvados.git] / docker / compute / wrapdocker

diff --git a/docker/compute/wrapdocker b/docker/compute/wrapdocker
index e714d5bd2d5729feaf78f7108bb96293dc682ffb..cee1302b3eb6417691b8d8783e24d9e7cd9a298b 100755 (executable)
--- a/docker/compute/wrapdocker
+++ b/docker/compute/wrapdocker
@@ -7,10 +7,10 @@
 CGROUP=/sys/fs/cgroup
 : {LOG:=stdio}
 
-[ -d $CGROUP ] || 
+[ -d $CGROUP ] ||
        mkdir $CGROUP
 
-mountpoint -q $CGROUP || 
+mountpoint -q $CGROUP ||
        mount -n -t tmpfs -o uid=0,gid=0,mode=0755 cgroup $CGROUP || {
                echo "Could not make a tmpfs mount. Did you use -privileged?"
                exit 1
@@ -28,7 +28,7 @@ fi
 for SUBSYS in $(cut -d: -f2 /proc/1/cgroup)
 do
         [ -d $CGROUP/$SUBSYS ] || mkdir $CGROUP/$SUBSYS
-        mountpoint -q $CGROUP/$SUBSYS || 
+        mountpoint -q $CGROUP/$SUBSYS ||
                 mount -n -t cgroup -o $SUBSYS cgroup $CGROUP/$SUBSYS
 
         # The two following sections address a bug which manifests itself
@@ -85,6 +85,6 @@ popd >/dev/null
 # If a pidfile is still around (for example after a container restart),
 # delete it so that docker can start.
 rm -rf /var/run/docker.pid
-       
+
 exec docker -d