diff options
author | Michael Janczyk | 2012-12-17 17:56:33 +0100 |
---|---|---|
committer | Michael Janczyk | 2012-12-17 17:56:33 +0100 |
commit | 9d38d5a411160637eedd997e14ccb520b41421c0 (patch) | |
tree | ab38b46f60a9738740ec65830eb74188b959008e /src/initramfs/scripts/bin/hwautocfg | |
parent | Follow links in modprobe.d when copying to stage3. (diff) | |
parent | Use zram if available (assign a quarter for compressed ram swap) (diff) | |
download | core-9d38d5a411160637eedd997e14ccb520b41421c0.tar.gz core-9d38d5a411160637eedd997e14ccb520b41421c0.tar.xz core-9d38d5a411160637eedd997e14ccb520b41421c0.zip |
Merge branch 'master' of git.openslx.org:openslx/core
Diffstat (limited to 'src/initramfs/scripts/bin/hwautocfg')
-rwxr-xr-x | src/initramfs/scripts/bin/hwautocfg | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/initramfs/scripts/bin/hwautocfg b/src/initramfs/scripts/bin/hwautocfg index 482c9f9a..3548abaa 100755 --- a/src/initramfs/scripts/bin/hwautocfg +++ b/src/initramfs/scripts/bin/hwautocfg @@ -1,6 +1,6 @@ #!/bin/sh # Copyright (c) 2003..2006 - RZ Uni Freiburg -# Copyright (c) 2006..2011 - OpenSLX GmbH +# Copyright (c) 2006..2012 - OpenSLX GmbH # # This program is free software distributed under the GPL version 2. # See http://openslx.org/COPYING @@ -277,12 +277,18 @@ case $1 in # disk setup part (detecting general id82,83 and slx id44,45,46, formatting # if required and mounting) disk) - # try to enable compressed RAM SWAP + # try to enable compressed RAM SWAP / ZRAM if modprobe ${MODPRV} ramzswap 2>/dev/null && [ -f /usr/bin/rzscontrol ] ; then mdev -s rzscontrol /dev/ramzswap0 --init - swapon /dev/ramzswap0 + swapon /dev/ramzswap0 2>/dev/null #hdswap="# disk swap disabled because of enabled compressed ramswap" + elif modprobe ${MODPRV} zram 2>/dev/null ; then + mdev -s + # assign a quarter of total mem to zram + echo $(( $(free -k | awk '/^Mem:/ { print $2 }') * 256 )) > /sys/block/zram0/disksize + mkswap /dev/zram0 2>/dev/null + swapon /dev/zram0 2>/dev/null fi # if disk action is not disabled if [ "x${hw_local_disk}" != "xno" ] ; then |