[openwrt/openwrt] base-files: fix option to make /var persistent

LEDE Commits lede-commits at lists.infradead.org
Mon Aug 23 04:10:03 PDT 2021


stintel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/669d920e278fe00895490d7c1a81774317ff358a

commit 669d920e278fe00895490d7c1a81774317ff358a
Author: Stijn Tintel <stijn at linux-ipv6.be>
AuthorDate: Mon Aug 23 14:06:35 2021 +0300

    base-files: fix option to make /var persistent
    
    The option was initially named TARGET_ROOTFS_LN_VAR_TMP, and the check
    was correct. When renaming the option to something more suitable, the
    check was changed to check for n, but when an option is not set, it's
    not n but empty. This results in the check always evaluating to false.
    Fix the check by checking for y with ifneq.
    
    Fixes: 57807f50ded6 ("base-files: add option to make /var persistent")
    
    Signed-off-by: Stijn Tintel <stijn at linux-ipv6.be>
---
 package/base-files/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index 6da3df2b4e..58ad08c63a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -181,7 +181,7 @@ define Package/base-files/install
 	mkdir -p $(1)/www
 	mkdir -p $(1)/root
 	$(LN) /proc/mounts $(1)/etc/mtab
-ifeq ($(CONFIG_TARGET_ROOTFS_PERSIST_VAR),n)
+ifneq ($(CONFIG_TARGET_ROOTFS_PERSIST_VAR),y)
 	rm -f $(1)/var
 	$(LN) tmp $(1)/var
 else



More information about the lede-commits mailing list