2018-04-13 10:09:40 +00:00
|
|
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
|
|
|
Date: Fri, 13 Apr 2018 14:36:43 +0200
|
|
|
|
|
Subject: 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>
|
|
|
|
|
|
|
|
|
|
diff --git a/package/base-files/Makefile b/package/base-files/Makefile
|
2018-04-17 20:23:26 +00:00
|
|
|
index f473ef732106eb8fa05e7c5b59df176fef33e42d..32b1ce0923cb984ff32e4444a18eccdad7572d70 100644
|
2018-04-13 10:09:40 +00:00
|
|
|
--- a/package/base-files/Makefile
|
|
|
|
|
+++ b/package/base-files/Makefile
|
|
|
|
|
@@ -59,8 +59,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
|
