Let mlim -S be in megabytes as documented (not in bytes)

vaeth · Feb 23, 2021 · 24949d8 · 24949d8
1 parent d5c1840
commit 24949d8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/AUTHORS b/AUTHORS
@@ -10,6 +10,7 @@ Karol Herbst <git at karolherbst.de>
 ko-zu
 Thomas Kear
 Jan Palus <atler at pid-linux.org> (avoid shell calculation)
+Zolran Puskas (https://github.com/zpuskas) (observe mlimit not in Mb)
 Kriss (https://github.com/Kr1ss-XD) (fix installing the localized manpages)
 Mattéo Rossillol‑‑Laruelle <beatussum at protonmail.com> (https://github.com/beatussum) (XFS support, Makefile, i18n support, Makefile, French translation)
 Edlund Scott <at sredlund>

diff --git a/ChangeLog b/ChangeLog
@@ -1,5 +1,10 @@
 # ChangeLog for zram-init:
 
+*zram-init-10.10:
+	Martin Väth <martin at mvath.de>:
+	- Let mlim (-S) actually be in megabytes as documented (not in bytes).
+	  See https://github.com/vaeth/zram-init/issues/32.
+
 *zram-init-10.9:
 	Martin Väth <martin at mvath.de>:
 	- Workaround for zsh completion heuristics for init.d scripts.

diff --git a/sbin/zram-init.in b/sbin/zram-init.in
@@ -385,7 +385,7 @@ else	[ -z "$streams" ] || SysCtl "$streams" "$block/max_comp_streams" \
 }
 	! $writeback || InitWriteback
 fi
-[ -z "$mem_limit" ] || SysCtl "$mem_limit" "$block/mem_limit" || \
+[ -z "$mem_limit" ] || SysCtl "$[mem_limit}M" "$block/mem_limit" || \
 	xWarning 'failed to set zram${dev} mem_limit'
 
 eval "set -- a $mkfs_opt"