aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/Makefile
diff options
context:
space:
mode:
authorMatthias Schiffer <mschiffer@universe-factory.net>2018-04-13 14:36:43 +0200
committerMatthias Schiffer <mschiffer@universe-factory.net>2018-04-13 14:36:43 +0200
commitd13c7acd9e34c5d64a03d8860752b4d75a6b906e (patch)
tree081dd6126cbd0a24e6e9ad141dbb3c6d1805d2e9 /package/base-files/Makefile
parent07b4e49abb336775e3d6c2f67739343b77c4f768 (diff)
downloadupstream-d13c7acd9e34c5d64a03d8860752b4d75a6b906e.tar.gz
upstream-d13c7acd9e34c5d64a03d8860752b4d75a6b906e.tar.bz2
upstream-d13c7acd9e34c5d64a03d8860752b4d75a6b906e.zip
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@universe-factory.net>
Diffstat (limited to 'package/base-files/Makefile')
-rw-r--r--package/base-files/Makefile4
1 files changed, 1 insertions, 3 deletions
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