[openwrt/openwrt] base-files: remove /etc/sysctl.d/ from conffiles

LEDE Commits lede-commits at lists.infradead.org
Fri Apr 13 05:38:27 PDT 2018


neoraider pushed a commit to openwrt/openwrt.git, branch master:
https://git.lede-project.org/d13c7acd9e34c5d64a03d8860752b4d75a6b906e

commit d13c7acd9e34c5d64a03d8860752b4d75a6b906e
Author: Matthias Schiffer <mschiffer at universe-factory.net>
AuthorDate: Fri Apr 13 14:36:43 2018 +0200

    base-files: remove /etc/sysctl.d/ from conffiles
    
    Let's use /etc/sysctl.d for package-provided snippets and leave
    /etc/sysctl.conf to the admin. Don't backup /etc/sysctl.d on upgrades, so
    old defaults get replaced properly.
    
    Signed-off-by: Matthias Schiffer <mschiffer at universe-factory.net>
---
 package/base-files/Makefile | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f35b4db..576db2a 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk
 include $(INCLUDE_DIR)/feeds.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=187
+PKG_RELEASE:=188
 PKG_FLAGS:=nonshared
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
@@ -65,8 +65,6 @@ define Package/base-files/conffiles
 /etc/shadow
 /etc/shells
 /etc/sysctl.conf
-/etc/sysctl.d/
-/etc/sysctl.d/local.conf
 /etc/sysupgrade.conf
 $(call $(TARGET)/conffiles)
 endef



More information about the lede-commits mailing list