From 3e2a789ca2152ceab6d39ad412f7cbfae5c4cace Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 9 Jan 2011 03:44:55 +0100 Subject: [PATCH] util-linux-ng: rework init scripts Signed-off-by: Stephan Raue --- .../init.d/{09_swapfile => 32_swapfile} | 49 +++++++++---------- 1 file changed, 23 insertions(+), 26 deletions(-) rename packages/sysutils/util-linux-ng/init.d/{09_swapfile => 32_swapfile} (56%) mode change 100755 => 100644 diff --git a/packages/sysutils/util-linux-ng/init.d/09_swapfile b/packages/sysutils/util-linux-ng/init.d/32_swapfile old mode 100755 new mode 100644 similarity index 56% rename from packages/sysutils/util-linux-ng/init.d/09_swapfile rename to packages/sysutils/util-linux-ng/init.d/32_swapfile index 6b7da316cd..2b40145842 --- a/packages/sysutils/util-linux-ng/init.d/09_swapfile +++ b/packages/sysutils/util-linux-ng/init.d/32_swapfile @@ -1,5 +1,3 @@ -#!/bin/sh - ################################################################################ # Copyright (C) 2009-2010 OpenELEC.tv # http://www.openelec.tv @@ -25,32 +23,31 @@ # # runlevels: openelec, textmode -. /etc/profile +( + INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'` + SWAP=`blkid -t TYPE="swap" -o device` + SWAPFILE="$HOME/.cache/swapfile" -INSTALLED_MEMORY=`cat /proc/meminfo | grep 'MemTotal:' | awk '{print $2}'` -SWAP=`blkid -t TYPE="swap" -o device` -SWAPFILE="$HOME/.cache/swapfile" + if [ "$INSTALLED_MEMORY" -le "500000" ]; then + if [ -z "$SWAP" -a ! -f "$SWAPFILE" ]; then + progress "creating swapfile" + mkdir -p $HOME/.cache + dd if=/dev/zero of=$SWAPFILE bs=1024 count=262144 2>&1 > /dev/null + mkswap $SWAPFILE 2>&1 > /dev/null + fi -if [ "$INSTALLED_MEMORY" -le "500000" ]; then - if [ -z "$SWAP" -a ! -f "$SWAPFILE" ]; then - progress "creating swapfile" - mkdir -p $HOME/.cache - dd if=/dev/zero of=$SWAPFILE bs=1024 count=262144 2>&1 > /dev/null - mkswap $SWAPFILE 2>&1 > /dev/null - fi + progress "enable swap" + [ -z "$SWAP" -a -f "$SWAPFILE" ] && SWAP=$SWAPFILE + for i in $SWAP; do + swapon -p 10000 $SWAP 2>&1 > /dev/null + done - progress "enable swap" - [ -z "$SWAP" -a -f "$SWAPFILE" ] && SWAP=$SWAPFILE - for i in $SWAP; do - swapon -p 10000 $SWAP 2>&1 > /dev/null - done - - if [ "$INSTALLED_MEMORY" -le "260000" ]; then - sysctl -w vm.swappiness=100 2>&1 > /dev/null + if [ "$INSTALLED_MEMORY" -le "260000" ]; then + sysctl -w vm.swappiness=100 2>&1 > /dev/null + else + sysctl -w vm.swappiness=60 2>&1 > /dev/null + fi else - sysctl -w vm.swappiness=60 2>&1 > /dev/null + sysctl -w vm.swappiness=0 2>&1 > /dev/null fi -else - sysctl -w vm.swappiness=0 2>&1 > /dev/null -fi - +)& \ No newline at end of file