From 25a0dd30823e5863b4d90f2556d05149099be864 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 13 Nov 2020 17:43:46 +0100 Subject: [PATCH] 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 | 7 +------ buildroot-external/configs/odroid_c2_defconfig | 7 +------ buildroot-external/configs/odroid_c4_defconfig | 7 +------ buildroot-external/configs/odroid_n2_defconfig | 7 +------ buildroot-external/configs/odroid_xu4_defconfig | 7 +------ buildroot-external/configs/ova_defconfig | 7 +------ buildroot-external/configs/rpi0_w_defconfig | 7 +------ buildroot-external/configs/rpi2_defconfig | 7 +------ buildroot-external/configs/rpi3_64_defconfig | 7 +------ buildroot-external/configs/rpi3_defconfig | 7 +------ buildroot-external/configs/rpi4_64_defconfig | 7 +------ buildroot-external/configs/rpi4_defconfig | 7 +------ buildroot-external/configs/rpi_defconfig | 7 +------ buildroot-external/configs/tinker_defconfig | 7 +------ .../NetworkManager/system-connections/default | 2 ++ .../rootfs-overlay/etc/avahi/avahi-daemon.conf | 17 ----------------- .../usr/lib/systemd/dnssd/workstation.dnssd | 3 +++ buildroot-external/scripts/rootfs-layer.sh | 6 +++--- 18 files changed, 22 insertions(+), 104 deletions(-) delete mode 100644 buildroot-external/rootfs-overlay/etc/avahi/avahi-daemon.conf create mode 100644 buildroot-external/rootfs-overlay/usr/lib/systemd/dnssd/workstation.dnssd diff --git a/buildroot-external/configs/intel_nuc_defconfig b/buildroot-external/configs/intel_nuc_defconfig index 2d3a77483..8fe5c6aa5 100644 --- a/buildroot-external/configs/intel_nuc_defconfig +++ b/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 diff --git a/buildroot-external/configs/odroid_c2_defconfig b/buildroot-external/configs/odroid_c2_defconfig index 6d4d2390c..4d0ba6416 100644 --- a/buildroot-external/configs/odroid_c2_defconfig +++ b/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 diff --git a/buildroot-external/configs/odroid_c4_defconfig b/buildroot-external/configs/odroid_c4_defconfig index 4e0931ff7..913498242 100644 --- a/buildroot-external/configs/odroid_c4_defconfig +++ b/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 diff --git a/buildroot-external/configs/odroid_n2_defconfig b/buildroot-external/configs/odroid_n2_defconfig index f70573bd1..81c051387 100644 --- a/buildroot-external/configs/odroid_n2_defconfig +++ b/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 diff --git a/buildroot-external/configs/odroid_xu4_defconfig b/buildroot-external/configs/odroid_xu4_defconfig index 5817619d1..4ee22611d 100644 --- a/buildroot-external/configs/odroid_xu4_defconfig +++ b/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 diff --git a/buildroot-external/configs/ova_defconfig b/buildroot-external/configs/ova_defconfig index 32c9f347f..6c7e6728f 100644 --- a/buildroot-external/configs/ova_defconfig +++ b/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 diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index 5dd7a2c8a..493b6798f 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/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 diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 7762add83..ff7c854b0 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/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 diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index 487c00375..889349324 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/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 diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 4d51000ca..37596a44f 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/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 diff --git a/buildroot-external/configs/rpi4_64_defconfig b/buildroot-external/configs/rpi4_64_defconfig index 51ed9774d..4fea702ad 100644 --- a/buildroot-external/configs/rpi4_64_defconfig +++ b/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 diff --git a/buildroot-external/configs/rpi4_defconfig b/buildroot-external/configs/rpi4_defconfig index 3fd394a00..c4bbf0b97 100644 --- a/buildroot-external/configs/rpi4_defconfig +++ b/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 diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 24dda4098..b9226d53e 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/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 diff --git a/buildroot-external/configs/tinker_defconfig b/buildroot-external/configs/tinker_defconfig index a6894e283..d71622049 100644 --- a/buildroot-external/configs/tinker_defconfig +++ b/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 diff --git a/buildroot-external/rootfs-overlay/etc/NetworkManager/system-connections/default b/buildroot-external/rootfs-overlay/etc/NetworkManager/system-connections/default index 510318b1f..099e3ee60 100644 --- a/buildroot-external/rootfs-overlay/etc/NetworkManager/system-connections/default +++ b/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 diff --git a/buildroot-external/rootfs-overlay/etc/avahi/avahi-daemon.conf b/buildroot-external/rootfs-overlay/etc/avahi/avahi-daemon.conf deleted file mode 100644 index 41888957d..000000000 --- a/buildroot-external/rootfs-overlay/etc/avahi/avahi-daemon.conf +++ /dev/null @@ -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 diff --git a/buildroot-external/rootfs-overlay/usr/lib/systemd/dnssd/workstation.dnssd b/buildroot-external/rootfs-overlay/usr/lib/systemd/dnssd/workstation.dnssd new file mode 100644 index 000000000..1147788eb --- /dev/null +++ b/buildroot-external/rootfs-overlay/usr/lib/systemd/dnssd/workstation.dnssd @@ -0,0 +1,3 @@ +[Service] +Name=%H [%m] +Type=_workstation._tcp diff --git a/buildroot-external/scripts/rootfs-layer.sh b/buildroot-external/scripts/rootfs-layer.sh index abd5209eb..147f91a69 100755 --- a/buildroot-external/scripts/rootfs-layer.sh +++ b/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" }