Fix instance directory removal

Signed-off-by: Michael Fraenkel <fraenkel@us.ibm.com>
cloudfoundry-attic · Mar 17, 2016 · ffcdf89 · ffcdf89
1 parent a3ac7b9
commit ffcdf89
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/warden/root/linux/skeleton/destroy.sh b/warden/root/linux/skeleton/destroy.sh
@@ -48,7 +48,13 @@ then
       echo "About to remove cgroups"
       # Remove nested cgroups for nested-warden
       rmdir $path/instance* 2> /dev/null || true
-      rmdir $path
+      rmdir $path || true
+
+      if [ -d $path ]
+      then
+        echo "Failed to delete $path"
+        false
+      fi
     fi
   done