[openwrt/openwrt] qosify: move files to /etc/qosify

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/85cc0046060b83bf616ea9476f3d6d9530c72771

commit 85cc0046060b83bf616ea9476f3d6d9530c72771
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Mon Nov 8 22:26:45 2021 +0100

    qosify: move files to /etc/qosify
    
    Now that wildcard matching is supported, this makes it easier for packages
    to supply their own qosify rules
    
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 package/network/config/qosify/Makefile          | 6 +++---
 package/network/config/qosify/files/qosify.conf | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/network/config/qosify/Makefile b/package/network/config/qosify/Makefile
index de7615dc12..e5e1865422 100644
--- a/package/network/config/qosify/Makefile
+++ b/package/network/config/qosify/Makefile
@@ -39,15 +39,15 @@ endef
 
 define Package/qosify/conffiles
 /etc/config/qosify
-/etc/qosify-defaults.conf
+/etc/qosify/00-defaults.conf
 endef
 
 define Package/qosify/install
-	$(INSTALL_DIR) $(1)/lib/bpf $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/net
+	$(INSTALL_DIR) $(1)/lib/bpf $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/hotplug.d/net $(1)/etc/qosify
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/qosify-bpf.o $(1)/lib/bpf
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qosify $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/qosify.init $(1)/etc/init.d/qosify
-	$(INSTALL_DATA) ./files/qosify-defaults.conf $(1)/etc/qosify-defaults.conf
+	$(INSTALL_DATA) ./files/qosify-defaults.conf $(1)/etc/qosify/00-defaults.conf
 	$(INSTALL_DATA) ./files/qosify.conf $(1)/etc/config/qosify
 	$(INSTALL_DATA) ./files/qosify.hotplug $(1)/etc/hotplug.d/net/10-qosify
 endef
diff --git a/package/network/config/qosify/files/qosify.conf b/package/network/config/qosify/files/qosify.conf
index d607abe462..dba1d1a46d 100644
--- a/package/network/config/qosify/files/qosify.conf
+++ b/package/network/config/qosify/files/qosify.conf
@@ -1,5 +1,5 @@
 config defaults
-	list defaults /etc/qosify-defaults.conf
+	list defaults /etc/qosify/*.conf
 	option dscp_prio CS5
 	option dscp_icmp CS6
 	option dscp_bulk CS0