Hello community, here is the log from the commit of package compcache for openSUSE:11.4 checked in at Fri Mar 25 17:49:50 CET 2011. -------- --- old-versions/11.4/all/compcache/compcache.changes 2011-01-13 20:43:46.000000000 +0100 +++ 11.4/compcache/compcache.changes 2011-03-21 14:56:45.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 21 14:55:11 CET 2011 - tiwai@suse.de + +- Fix init script for 11.4 to work with empty $COMPCACHE_SIZE_KB + (bnc#681048) + +------------------------------------------------------------------- Package does not exist at destination yet. Using Fallback old-versions/11.4/all/compcache Destination is old-versions/11.4/UPDATES/all/compcache calling whatdependson for 11.4-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compcache.spec ++++++ --- /var/tmp/diff_new_pack.HqwmTY/_old 2011-03-25 17:48:50.000000000 +0100 +++ /var/tmp/diff_new_pack.HqwmTY/_new 2011-03-25 17:48:50.000000000 +0100 @@ -37,7 +37,7 @@ License: GPLv2 Group: System/Kernel Version: 0.6.2 -Release: 1 +Release: 4.<RELEASE5> Summary: Compressed RAM based swap device Source0: compcache-%{version}.tar.bz2 Source1: sysconfig.compcache ++++++ boot.compcache ++++++ --- /var/tmp/diff_new_pack.HqwmTY/_old 2011-03-25 17:48:50.000000000 +0100 +++ /var/tmp/diff_new_pack.HqwmTY/_new 2011-03-25 17:48:50.000000000 +0100 @@ -45,6 +45,10 @@ return $? } +get_memsize_in_kb () { + grep MemTotal /proc/meminfo | sed 's/^.* //;s/ .*$//g' +} + rc_reset case "$1" in @@ -56,8 +60,9 @@ else if [ "$COMPCACHE_SIZE_KB" -eq 0 ]; then # 25% of RAM - COMPCACHE_SIZE_STR="$(expr $(grep MemTotal /proc/meminfo | sed 's/^.* //;s/ .*$//g') / 4096) MB" - elif [ "$COMPCACHE_SIZE_KB" -lt 1024 ]; then + COMPCACHE_SIZE_KB=$(expr $(get_memsize_in_kb) / 4) + fi + if [ "$COMPCACHE_SIZE_KB" -lt 1024 ]; then COMPCACHE_SIZE_STR="$COMPCACHE_SIZE_KB kB" else COMPCACHE_SIZE_STR="$(expr $COMPCACHE_SIZE_KB / 1024) MB" @@ -82,11 +87,7 @@ if [ -f $SIZEBLK ]; then echo $(( $COMPCACHE_DEV_SIZE_KB * 1024 )) > $SIZEBLK else - if [ "$COMPCACHE_SIZE_KB" -gt 0 ]; then - $RZSCTL_BIN $SWAPDEV -d $COMPCACHE_DEV_SIZE_KB -i - else - $RZSCTL_BIN $SWAPDEV -i - fi + $RZSCTL_BIN $SWAPDEV -d $COMPCACHE_DEV_SIZE_KB -i fi if ! is_comp_swap_on $SWAPDEV; then echo -n "Setting up $ZRAM swap device $i " ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org