From a2d1caa1681de45d007910ae88f18b3715ec9d3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A5=D0=B8=D1=80=D0=B5=D1=86=D0=BA=D0=B8=D0=B9=20=D0=9C?= =?UTF-8?q?=D0=B8=D1=85=D0=B0=D0=B8=D0=BB?= Date: Tue, 26 May 2020 09:56:46 +0300 Subject: [PATCH] sys-apps/calculate-utils: init.d/zram MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * изменены название и описание параметров --- .../sys-apps/calculate-utils/conf.d/zram | 16 +++++----------- .../sys-apps/calculate-utils/init.d/zram | 2 +- .../remerge/2020/{20200525 => 20200526} | 0 3 files changed, 6 insertions(+), 12 deletions(-) rename profiles/templates/3.6/6_ac_update_sync/remerge/2020/{20200525 => 20200526} (100%) diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/zram b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/zram index 58a8a8591..24192c3d4 100644 --- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/zram +++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/conf.d/zram @@ -1,18 +1,12 @@ # Calculate protected exists(/etc/conf.d/zram)== -# RESTORE_ON_START: -# Compression algorithm for zram disk - -COMP_ALGORITHM="zstd" -# DISKSIZE: -# Zram disk size -# Memory percent or absolute value with suffix (K,M,G) +# Compression algorithm for zram disk +COMPRESSION="zstd" +# Zram disk size in percent of RAM or absolute value with suffix (K,M,G) DISKSIZE="200%" -# START # Start zram swap disk -# withoutswap - start only system swapless +# swapless - start only for swapless system # always - start anyway - -START="withoutswap" +START="swapless" diff --git a/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/init.d/zram b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/init.d/zram index cdb23f0de..73c90befa 100644 --- a/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/init.d/zram +++ b/profiles/templates/3.6/2_ac_install_merge/sys-apps/calculate-utils/init.d/zram @@ -28,7 +28,7 @@ start() ebegin "Activating zram swap devices" local disksize; modprobe zram - echo ${COMP_ALGORITHM:-zstd} >/sys/block/zram0/comp_algorithm + echo ${COMPRESSION:-zstd} >/sys/block/zram0/comp_algorithm if [[ ${DISKSIZE:-200%} =~ ^([0-9]+)%$ ]] then local perc="${BASH_REMATCH[1]}" diff --git a/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200525 b/profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200526 similarity index 100% rename from profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200525 rename to profiles/templates/3.6/6_ac_update_sync/remerge/2020/20200526