gwrx/openwrt
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Matthias Schiffer 2018-04-13 14:36:43 +02:00
parent 07b4e49abb
commit d13c7acd9e
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/base-files/Makefile
View File

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