Minor, consolidate naming and adjust avahi + mdns-alias conditions

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>

package/confd/confd.mk

@@ -42,7 +42,7 @@ define CONFD_INSTALL_EXTRA
 	done
 	cp $(CONFD_PKGDIR)/tmpfiles.conf $(TARGET_DIR)/etc/tmpfiles.d/confd.conf
 	mkdir -p $(TARGET_DIR)/etc/avahi/services
-	cp $(CONFD_PKGDIR)/avahi.service $(TARGET_DIR)/etc/avahi/services/netconf.service
+	cp $(CONFD_PKGDIR)/netconf.service $(TARGET_DIR)/etc/avahi/services/
 endef
 
 NETOPEER2_SEARCHPATH=$(TARGET_DIR)/usr/share/yang/modules/netopeer2/

package/mdns-alias/mdns-alias.svc

@@ -1,5 +1,5 @@
 # Avahi advertises the system default hostname, this service advertises
 # /etc/hostname (-H) and, optionally, network.local as CNAMEs.  Changes
 # to /etc/default/mdns-alias will cause Finit to restart not reload.
-service <service/mdns/running> env:-/etc/default/mdns-alias \
+service <pid/mdns> env:-/etc/default/mdns-alias \
 	[2345] mdns-alias -H $MDNS_ALIAS_ARGS --

package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf

@@ -1,2 +1,2 @@
-service <!> name:mdns env:-/etc/default/avahi \
+service <!pid/confd,usr/bootstrap> name:mdns env:-/etc/default/avahi \
 	[2345] avahi-daemon -s $AVAHI_ARGS -- Avahi mDNS-SD daemon