diff --git a/home.admin/_cache.sh b/home.admin/_cache.sh index 8c8bc9a2..03e971b1 100755 --- a/home.admin/_cache.sh +++ b/home.admin/_cache.sh @@ -139,7 +139,7 @@ elif [ "$1" = "set" ] || [ "$1" = "init" ]; then # get parameters keystr=$2 valuestr=$3 - expireOrNx=$4 + expire=$4 # check that key & value are provided if [ "${keystr}" == "" ]; then @@ -151,17 +151,16 @@ elif [ "$1" = "set" ] || [ "$1" = "init" ]; then NX="" if [ "$1" = "init" ]; then NX="NX " - else + fi + # filter from expire just numbers - expireOrNx="${expire//[^0-9.]/}" + expire="${expire//[^0-9.]/}" additionalParams="" # add an expire flag if given - if [ "${expireOrNx}" != "" ]; then + if [ "${expire}" != "" ]; then additionalParams="EX ${expire}" fi - fi - # set in redis key value cache redis-cli set ${NX} ${keystr} "${valuestr}" ${additionalParams} 1>/dev/null diff --git a/home.admin/config.scripts/blitz.debug.sh b/home.admin/config.scripts/blitz.debug.sh index 59143577..fbd9595a 100755 --- a/home.admin/config.scripts/blitz.debug.sh +++ b/home.admin/config.scripts/blitz.debug.sh @@ -446,6 +446,11 @@ echo "*** NETWORK ***" sudo /home/admin/config.scripts/internet.sh status | grep 'network_device\|localip\|dhcp' echo +echo +echo "*** ZRAM ***" +sudo /home/admin/config.scripts/blitz.zram.sh status +echo + echo "*** HARDWARE TEST RESULTS ***" source <(/home/admin/_cache.sh get system_count_undervoltage) showImproveInfo=0 diff --git a/home.admin/config.scripts/blitz.zram.sh b/home.admin/config.scripts/blitz.zram.sh index dc70d99e..2d467547 100644 --- a/home.admin/config.scripts/blitz.zram.sh +++ b/home.admin/config.scripts/blitz.zram.sh @@ -3,36 +3,72 @@ # using https://github.com/foundObjects/zram-swap VERSION="205ea1ec5b169f566e5e98ead794e9daf90cf245" +if [ "$1" = status ]; then + + # check if file /home/admin/download/zram-swap/install.sh exists + #echo "# https://github.com/foundObjects/zram-swap" + if [ -f /home/admin/download/zram-swap/install.sh ]; then + echo "downloaded=1" + else + echo "downloaded=0" + fi + + # check if service zram-swap is loaded/active + #echo "# sudo systemctl status zram-swap" + serviceLoaded=$(sudo systemctl status zram-swap 2>/dev/null | grep -c loaded) + if [ ${serviceLoaded} -gt 0 ]; then + echo "serviceLoaded=1" + else + echo "serviceLoaded=0" + fi + serviceActive=$(sudo systemctl status zram-swap 2>/dev/null | grep -c active) + if [ ${serviceActive} -gt 0 ]; then + echo "serviceActive=1" + else + echo "serviceActive=0" + fi + + exit 0 +fi + # command info if [ $# -eq 0 ] || [ "$1" = "-h" ] || [ "$1" = "-help" ]; then echo "config script to install ZRAM" - echo "blitz.zram.sh [on|off]" + echo "blitz.zram.sh [on|off|status]" echo "using https://github.com/foundObjects/zram-swap" exit 1 fi + +echo "# mkdir /home/admin/download" mkdir /home/admin/download 2>/dev/null cd /home/admin/download || exit 1 if [ ! -d zram-swap ]; then + echo "# download script" sudo -u admin git clone https://github.com/foundObjects/zram-swap.git + echo "# cd zram-swap" cd zram-swap || exit 1 - git reset --hard $VERSION || exit 1 + echo "# check version" + sudo -u admin git reset --hard $VERSION || exit 1 + echo "# version OK" else + echo "# script available" cd zram-swap || exit 1 + echo "# directory OK" fi if [ "$1" = on ]; then + echo "# install zram-swap" if [ $(sudo cat /proc/swaps | grep -c zram) -eq 0 ]; then # install zram to 1/2 of RAM, activate and prioritize sudo /home/admin/download/zram-swap/install.sh # make better use of zram - echo "\ -vm.vfs_cache_pressure=500 -vm.swappiness=100 -vm.dirty_background_ratio=1 -vm.dirty_ratio=50 -" | sudo tee -a /etc/sysctl.conf + echo "# RaspiBlitz Edit: blitz.zram.sh" | sudo tee -a /etc/sysctl.conf + echo "vm.vfs_cache_pressure=500" | sudo tee -a /etc/sysctl.conf + echo "vm.swappiness=100" | sudo tee -a /etc/sysctl.conf + echo "vm.dirty_background_ratio=1" | sudo tee -a /etc/sysctl.conf + echo "vm.dirty_ratio=50" | sudo tee -a /etc/sysctl.conf # apply sudo sysctl --system @@ -47,6 +83,7 @@ vm.dirty_ratio=50 fi if [ "$1" = off ]; then + echo "# deinstall zram-swap" sudo /home/admin/download/zram-swap/install.sh --uninstall sudo rm /etc/default/zram-swap sudo rm -rf /home/admin/download/zram-swap