dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove unused messages in the installer
[lhc/web/wiklou.git]
/
includes
/
limit.sh
diff --git
a/includes/limit.sh
b/includes/limit.sh
old mode 100644
(file)
new mode 100755
(executable)
index
82197b5
..
d71e660
--- 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
# 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
else
ulimit -v "$MW_MEM_LIMIT"
fi