From adee27f9231998408c79d08bdf2220e5a87e2389 Mon Sep 17 00:00:00 2001
From: Joachim Wiberg <troglobit@gmail.com>
Date: Mon, 16 Mar 2026 12:28:59 +0100
Subject: [PATCH] Minor, consolidate naming and adjust avahi + mdns-alias
 conditions

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
---
 package/confd/confd.mk                                          | 2 +-
 package/confd/{avahi.service => netconf.service}                | 0
 package/mdns-alias/mdns-alias.svc                               | 2 +-
 .../skeleton/etc/finit.d/available/avahi.conf                   | 2 +-
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename package/confd/{avahi.service => netconf.service} (100%)

diff --git a/package/confd/confd.mk b/package/confd/confd.mk
index eeab1fe2..ccb50d2b 100644
--- a/package/confd/confd.mk
+++ b/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/
diff --git a/package/confd/avahi.service b/package/confd/netconf.service
similarity index 100%
rename from package/confd/avahi.service
rename to package/confd/netconf.service
diff --git a/package/mdns-alias/mdns-alias.svc b/package/mdns-alias/mdns-alias.svc
index 298317cb..241edc61 100644
--- a/package/mdns-alias/mdns-alias.svc
+++ b/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 --
diff --git a/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf b/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf
index 916d85fb..dfcf76ba 100644
--- a/package/skeleton-init-finit/skeleton/etc/finit.d/available/avahi.conf
+++ b/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