From: Matthias Schiffer Date: Fri, 13 Apr 2018 12:36:43 +0000 (+0200) Subject: base-files: remove /etc/sysctl.d/ from conffiles X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d13c7acd9e34c5d64a03d8860752b4d75a6b906e;p=librecmc%2Flibrecmc.git 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 --- diff --git a/package/base-files/Makefile b/package/base-files/Makefile index f35b4db79b..576db2a0ab 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