From 415a371bb2406b471a8a4fb27a76e74e2b85ce71 Mon Sep 17 00:00:00 2001
From: yayg <4986194+Yayg@users.noreply.github.com>
Date: Thu, 2 May 2024 11:56:08 +0200
Subject: [PATCH] Leave resolving configuration to the system

While installing debian comes with a configuration for resolving and
resolved is not necessary and causing problems in some cases (no IPv6,
custom network setup, etc...)
Thus it might be better to leave this configuration to the system
administrator while installing the supervised way.
---
 homeassistant-supervised/DEBIAN/postinst      | 13 ----------
 homeassistant-supervised/DEBIAN/preinst       |  3 ---
 .../etc/systemd/resolved.conf                 | 25 -------------------
 3 files changed, 41 deletions(-)
 delete mode 100644 homeassistant-supervised/etc/systemd/resolved.conf

diff --git a/homeassistant-supervised/DEBIAN/postinst b/homeassistant-supervised/DEBIAN/postinst
index 11f337d..c62162c 100755
--- a/homeassistant-supervised/DEBIAN/postinst
+++ b/homeassistant-supervised/DEBIAN/postinst
@@ -27,19 +27,6 @@ systemctl daemon-reload
 info "Restarting NetworkManager"
 systemctl restart "${SERVICE_NM}"
 
-# Set permissions of /etc/systemd/resolved.conf
-# check if file has correct permissions
-if [ "$(stat -c %a /etc/systemd/resolved.conf)" != "644" ]; then
-    info "Setting permissions of /etc/systemd/resolved.conf"
-    chmod 644 /etc/systemd/resolved.conf
-fi
-
-# Enable and restart systemd-resolved
-info "Enable systemd-resolved"
-systemctl enable systemd-resolved.service> /dev/null 2>&1;
-info "Restarting systemd-resolved"
-systemctl restart systemd-resolved.service
-
 # Check and fix systemd-journal-gatewayd socket location
 if [ ! -S "/run/systemd-journal-gatewayd.sock" ]; then
     info "Set up systemd-journal-gatewayd socket file"
diff --git a/homeassistant-supervised/DEBIAN/preinst b/homeassistant-supervised/DEBIAN/preinst
index 9b99839..a740697 100755
--- a/homeassistant-supervised/DEBIAN/preinst
+++ b/homeassistant-supervised/DEBIAN/preinst
@@ -78,6 +78,3 @@ dpkg-divert --package homeassistant-supervised --add --rename \
 
 dpkg-divert --package homeassistant-supervised --add --rename \
     --divert /etc/docker/daemon.json.real /etc/docker/daemon.json
-
-dpkg-divert --package homeassistant-supervised --add --rename \
-    --divert /etc/systemd/resolved.conf.real /etc/systemd/resolved.conf
diff --git a/homeassistant-supervised/etc/systemd/resolved.conf b/homeassistant-supervised/etc/systemd/resolved.conf
deleted file mode 100644
index db934d0..0000000
--- a/homeassistant-supervised/etc/systemd/resolved.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-#
-# Entries in this file show the compile time defaults.
-# You can change settings by editing this file.
-# Defaults can be restored by simply deleting this file.
-#
-# See resolved.conf(5) for details
-
-[Resolve]
-#DNS=
-#FallbackDNS=1.1.1.1 8.8.8.8 1.0.0.1 8.8.4.4 2606:4700:4700::1111 2001:4860:4860::8888 2606:4700:4700::1001 2001:4860:4860::8844
-#Domains=
-DNSSEC=no
-DNSOverTLS=no
-#MulticastDNS=yes
-#LLMNR=yes
-#Cache=yes
-DNSStubListener=no
-#ReadEtcHosts=yes
-#ResolveUnicastSingleLabel=no
\ No newline at end of file