Use systemd-resolved to announce hostname via mDNS and LLMNR (#986)

Drop AVAHI and use systemd-resolved to announce hostname via mDNS
and LLMNR. Also continue to offer the _workstation._tcp.local service
since it is used by the CoreDNS mDNS plug-in.

buildroot-external/configs/intel_nuc_defconfig

@@ -54,11 +54,6 @@ BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -78,7 +73,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/odroid_c2_defconfig

@@ -46,11 +46,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
@@ -69,7 +64,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/odroid_c4_defconfig

@@ -46,11 +46,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
@@ -69,7 +64,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/odroid_n2_defconfig

@@ -46,11 +46,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
@@ -69,7 +64,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/odroid_xu4_defconfig

@@ -48,11 +48,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
@@ -71,7 +66,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/ova_defconfig

@@ -44,11 +44,6 @@ BR2_PACKAGE_GPTFDISK_SGDISK=y
 BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -69,7 +64,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/rpi0_w_defconfig

@@ -49,11 +49,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -72,7 +67,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/rpi2_defconfig

@@ -48,11 +48,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -71,7 +66,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/rpi3_64_defconfig

@@ -49,11 +49,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -72,7 +67,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/rpi3_defconfig

@@ -49,11 +49,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -72,7 +67,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/rpi4_64_defconfig

@@ -50,11 +50,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -73,7 +68,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/rpi4_defconfig

@@ -50,11 +50,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -73,7 +68,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/rpi_defconfig

@@ -48,11 +48,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -71,7 +66,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/configs/tinker_defconfig

@@ -50,11 +50,6 @@ BR2_PACKAGE_CA_CERTIFICATES=y
 BR2_PACKAGE_LIBDNET=y
 BR2_PACKAGE_LIBCGROUP=y
 BR2_PACKAGE_LIBCGROUP_TOOLS=y
-BR2_PACKAGE_AVAHI=y
-# BR2_PACKAGE_AVAHI_AUTOIPD is not set
-BR2_PACKAGE_AVAHI_DAEMON=y
-BR2_PACKAGE_AVAHI_LIBDNSSD_COMPATIBILITY=y
-BR2_PACKAGE_NSS_MDNS=y
 BR2_PACKAGE_BLUEZ5_UTILS=y
 BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
 BR2_PACKAGE_DHCP=y
@@ -73,7 +68,7 @@ BR2_PACKAGE_RNG_TOOLS=y
 # BR2_PACKAGE_SYSTEMD_HWDB is not set
 # BR2_PACKAGE_SYSTEMD_NETWORKD is not set
 BR2_PACKAGE_SYSTEMD_RANDOMSEED=y
-# BR2_PACKAGE_SYSTEMD_RESOLVED is not set
+BR2_PACKAGE_SYSTEMD_RESOLVED=y
 BR2_PACKAGE_SYSTEMD_COREDUMP=y
 BR2_PACKAGE_SYSTEMD_LOGIND=y
 BR2_PACKAGE_UTIL_LINUX_PARTX=y

buildroot-external/rootfs-overlay/etc/NetworkManager/system-connections/default

@@ -2,6 +2,8 @@
 id=HassOS default
 uuid=f62bf7c2-e565-49ff-bbfc-a4cf791e6add
 type=802-3-ethernet
+llmnr=2
+mdns=2
 
 [ipv4]
 method=auto

buildroot-external/rootfs-overlay/etc/avahi/avahi-daemon.conf

@@ -1,17 +0,0 @@
-# See avahi-daemon.conf(5) for more information on this configuration
-# file!
-
-[server]
-deny-interfaces=hassio, docker0
-use-ipv4=yes
-use-ipv6=yes
-enable-dbus=yes
-ratelimit-interval-usec=1000000
-ratelimit-burst=1000
-
-[wide-area]
-enable-wide-area=yes
-
-[publish]
-publish-hinfo=no
-publish-workstation=yes

buildroot-external/rootfs-overlay/usr/lib/systemd/dnssd/workstation.dnssd

@@ -0,0 +1,3 @@
+[Service]
+Name=%H [%m]
+Type=_workstation._tcp

buildroot-external/scripts/rootfs-layer.sh

@@ -16,9 +16,6 @@ function fix_rootfs() {
     # Cleanup miscs
     rm -rf "${TARGET_DIR}/usr/lib/modules-load.d"
 
-    # Don't announce services we don't offer
-    rm -rf "${TARGET_DIR}/etc/avahi/services/sftp-ssh.service" "${TARGET_DIR}/etc/avahi/services/ssh.service"
-
     # Fix: permission for system connection files
     chmod 600 "${TARGET_DIR}/etc/NetworkManager/system-connections"/*
 
@@ -27,6 +24,9 @@ function fix_rootfs() {
 
     # Fix: Could not generate persistent MAC address
     sed -i "s/MACAddressPolicy=persistent/MACAddressPolicy=none/g" "${TARGET_DIR}/usr/lib/systemd/network/99-default.link"
+
+    # Use systemd-resolved for Host OS resolve
+    sed -i '/^hosts:/ {s/dns/resolve [!UNAVAIL=return] dns/}' "${TARGET_DIR}/etc/nsswitch.conf"
 }