Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix error message when swap is disabled

Browse source 
Bug: 65465
Change-Id: Ibb1b14f5271d60c039398e8ce8a9c2a5d245241f
This commit is contained in:
Tim Starling 2014-05-19 10:41:52 +10:00
parent bfe28c103d
commit 29f4fd5035
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
includes/limit.sh
View file

@ -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