diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-11-23 22:30:42 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-11-23 22:30:42 +0000 |
| commit | a8134e221a661d0944d3da33baffcaed51b3328a (patch) | |
| tree | a45550497196de16d1924cda8399df11a4c64c36 /package/compcache/files | |
| parent | a3e05d4f852c31d93468b76658994e2426a5ae68 (diff) | |
| download | upstream-a8134e221a661d0944d3da33baffcaed51b3328a.tar.gz upstream-a8134e221a661d0944d3da33baffcaed51b3328a.tar.bz2 upstream-a8134e221a661d0944d3da33baffcaed51b3328a.zip | |
[package] update compcache to 0.5.4 (#6018)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18512 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/compcache/files')
| -rw-r--r-- | package/compcache/files/compcache.config | 5 | ||||
| -rw-r--r-- | package/compcache/files/compcache.init | 28 |
2 files changed, 22 insertions, 11 deletions
diff --git a/package/compcache/files/compcache.config b/package/compcache/files/compcache.config index 96ee19284a..3faab3e140 100644 --- a/package/compcache/files/compcache.config +++ b/package/compcache/files/compcache.config @@ -1,3 +1,4 @@ config compcache - option 'enabled' '0' - option 'size_kbytes' '2048' + option 'enabled' '%ENABLED%' + option 'size_kbytes' '%RAM_REPORTED%' + option 'backup_dev' '%BACKUP_DEV%' diff --git a/package/compcache/files/compcache.init b/package/compcache/files/compcache.init index 5c85e5ddd2..b9406d108c 100644 --- a/package/compcache/files/compcache.init +++ b/package/compcache/files/compcache.init @@ -1,18 +1,28 @@ #!/bin/sh /etc/rc.common # Copyright (C) 2008 OpenWrt.org -START=19 +START=14 load_modules() { local section="$1" config_get "size_kbytes" "$section" "size_kbytes" + config_get "backup_dev" "$section" "backup_dev" + #CC_PARAM_STR="memlimit_kb=$1 backing_dev=$BACKING_DEV" config_get_bool "enabled" "$section" "enabled" '1' if [ "$enabled" -gt 0 ]; then - if [ "`lsmod | grep 'compcache'`" != "" ]; then - echo "compcache allready loaded" + if [ "`cat /proc/swaps | grep 'ramzswap0'`" != "" ]; then + echo "compcache already loaded" else - insmod xvmalloc - insmod lzo1x - insmod compcache compcache_size_kbytes=$size_kbytes + if [ "$backup_dev" != "" ]; then + params_set="memlimit_kb=$size_kbytes backing_swap=$backup_dev" + else + params_set="disksize_kb=$size_kbytes" + fi + if [ "`lsmod | grep 'ramzswap'`" == "" ]; then + insmod xvmalloc + insmod lzo1x + insmod ramzswap $params_set + swapon /dev/ramzswap0 + fi fi fi } @@ -22,9 +32,9 @@ remove_modules() { config_get_bool "enabled" "$section" "enabled" '1' if [ "$enabled" -gt 0 ]; then [ "`cat /proc/swaps | grep 'ramzswap0'`" != "" ] && swapoff /dev/ramzswap0 - [ "`lsmod | grep 'compcache'`" != "" ] && rmmod compcache > /dev/null - [ "`lsmod | grep 'lzo1x'`" != "" ] && rmmod lzo1x > /dev/null - [ "`lsmod | grep 'xvmalloc'`" != "" ] && rmmod xvmalloc > /dev/null + [ "`lsmod | grep 'ramzswap'`" != "" ] && rmmod ramzswap &> /dev/null + [ "`lsmod | grep 'lzo1x'`" != "" ] && rmmod lzo1x &> /dev/null + [ "`lsmod | grep 'xvmalloc'`" != "" ] && rmmod xvmalloc &> /dev/null fi } |