[openwrt/openwrt] procd: remove support for mounting /tmp in zram

LEDE Commits lede-commits at lists.infradead.org
Thu Mar 3 12:23:18 PST 2022


rsalvaterra pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/247eaa44161b0a07e2dd40ffaa181d47ca10a96b

commit 247eaa44161b0a07e2dd40ffaa181d47ca10a96b
Author: Rui Salvaterra <rsalvaterra at gmail.com>
AuthorDate: Mon Jul 13 14:03:47 2020 +0100

    procd: remove support for mounting /tmp in zram
    
    The /tmp directory is mounted as tmpfs. The tmpfs filesystem is backed by
    anonymous memory, which means it can be swapped out at any time, if there is
    memory pressure [1]. For this reason, a zram swap device is a much better
    choice than mounting /tmp on zram, since it's able to compress all anonymous
    memory, and not just the memory assigned to /tmp. We already have the zram-swap
    package for this specific purpose, which means procd's tmp-on-zram is both
    redundant and more limited.
    
    A follow-up patch will remove support for mounting /tmp in zram from procd
    itself.
    
    [1] https://www.kernel.org/doc/Documentation/filesystems/tmpfs.txt
    
    Signed-off-by: Rui Salvaterra <rsalvaterra at gmail.com>
---
 package/system/procd/Makefile | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
index 8f814982bf..958a4808cb 100644
--- a/package/system/procd/Makefile
+++ b/package/system/procd/Makefile
@@ -24,8 +24,7 @@ PKG_MAINTAINER:=John Crispin <john at phrozen.org>
 
 PKG_ASLR_PIE_REGULAR:=1
 PKG_CONFIG_DEPENDS:= \
-	CONFIG_TARGET_INIT_PATH CONFIG_KERNEL_SECCOMP \
-	CONFIG_PROCD_SHOW_BOOT CONFIG_PROCD_ZRAM_TMPFS \
+	CONFIG_TARGET_INIT_PATH CONFIG_KERNEL_SECCOMP CONFIG_PROCD_SHOW_BOOT \
 	CONFIG_KERNEL_NAMESPACES CONFIG_PACKAGE_procd-ujail CONFIG_PACKAGE_procd-seccomp
 
 include $(INCLUDE_DIR)/package.mk
@@ -96,10 +95,6 @@ config PROCD_SHOW_BOOT
 	default n
 	prompt "Print the shutdown to the console as well as logging it to syslog"
 
-config PROCD_ZRAM_TMPFS
-	bool
-	default n
-	prompt "Mount /tmp using zram."
 endmenu
 endef
 
@@ -111,10 +106,6 @@ ifeq ($(CONFIG_PROCD_SHOW_BOOT),y)
   CMAKE_OPTIONS += -DSHOW_BOOT_ON_CONSOLE=1
 endif
 
-ifeq ($(CONFIG_PROCD_ZRAM_TMPFS),y)
-  CMAKE_OPTIONS += -DZRAM_TMPFS=1
-endif
-
 ifdef CONFIG_PACKAGE_procd-ujail
   CMAKE_OPTIONS += -DJAIL_SUPPORT=1
 endif




More information about the lede-commits mailing list