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@nbd.name>

diff --git a/package/network/config/qosify/Makefile b/package/network/config/qosify/Makefile
index de7615dc12876be428b064737db461428a5b564b..e5e18654225c27cedcb6f436dafeee09aac433e2 100644 (file)
--- 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 d607abe462dba26ea33a7e5ec94d457f3adec54b..dba1d1a46d487d91d787b591c7db4ca861044606 100644 (file)
--- 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