c28b797c91
aaecfecdcd kernel: bump kernel 4.4 to version 4.4.139 b08003223a base-files: fix links in banner.failsafe 71019a7605 ar71xx: fix 5 GHz Wi-Fi on NBG6716 ba5c0a1dea Revert "base-files: fix UCI config parsing and callback handling" 5c6a8a9cdb kernel: bump kernel 4.4 to version 4.4.138 cf4a37a581 uci: add missing 'option' support to uci_rename() 7fc94b2a25 mac80211: rt2x00: no longer use TXOP_BACKOFF for probe frames b03826d8aa kernel: bump kernel 4.4 to version 4.4.137 21f44e3389 map: add ealen as configurable uci parameter Signed-off-by: Christoph Krapp <achterin@googlemail.com>
24 lines
829 B
Diff
24 lines
829 B
Diff
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
|
|
index f473ef732106eb8fa05e7c5b59df176fef33e42d..32b1ce0923cb984ff32e4444a18eccdad7572d70 100644
|
|
--- 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
|