X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Flimit.sh;h=d71e660387dfc9b6b09a0dff5433cebfcb7264a9;hb=5befb9b74790a99aec5514ad8f8784a4fb085288;hp=82197b53ca02715d0a1bfb31dfc719dead82163c;hpb=1dc9d1a6195a00d8d2ba74e4d8d45320439b9de6;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/limit.sh b/includes/limit.sh
old mode 100644
new mode 100755
index 82197b53ca..d71e660387
--- a/includes/limit.sh
+++ b/includes/limit.sh
@@ -76,7 +76,10 @@ if [ "$MW_MEM_LIMIT" -gt 0 ]; then
 		# Memory
 		echo $(($MW_MEM_LIMIT*1024)) > "$MW_CGROUP"/$$/memory.limit_in_bytes
 		# Memory+swap
-		echo $(($MW_MEM_LIMIT*1024)) > "$MW_CGROUP"/$$/memory.memsw.limit_in_bytes
+		# This will be missing if there is no swap
+		if [ -e "$MW_CGROUP"/$$/memory.memsw.limit_in_bytes ]; then
+			echo $(($MW_MEM_LIMIT*1024)) > "$MW_CGROUP"/$$/memory.memsw.limit_in_bytes
+		fi
 	else
 		ulimit -v "$MW_MEM_LIMIT"
 	fi