From 940d5901a33c94bf120bf437c83a4609e3b1a91e Mon Sep 17 00:00:00 2001
From: Jan Philipp Timme <jan.philipp@timme.it>
Date: Wed, 29 Dec 2021 11:04:03 +0100
Subject: [PATCH] Enforce systemd-resolved replacing legacy resolvconf state
---
hshbase/init.sls | 1 -
hshbase/systemd-resolved/init.sls | 8 ++++++++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/hshbase/init.sls b/hshbase/init.sls
index 8f9efa9..4668bd5 100644
--- a/hshbase/init.sls
+++ b/hshbase/init.sls
@@ -10,5 +10,4 @@ include:
- .locale
- .hostname
- .systemd-resolved
- - .resolvconf
- .automatic-salt-minion-restart
diff --git a/hshbase/systemd-resolved/init.sls b/hshbase/systemd-resolved/init.sls
index 5b6e73e..64a8829 100644
--- a/hshbase/systemd-resolved/init.sls
+++ b/hshbase/systemd-resolved/init.sls
@@ -13,3 +13,11 @@ hsh_enable_and_restart_systemd_resolved:
- file: hsh_manage_systemd_resolved_config
- watch:
- file: hsh_manage_systemd_resolved_config
+
+hsh_override_resolveconf_with_symlink:
+ file.symlink:
+ - name: /etc/resolv.conf
+ - target: /run/systemd/resolve/stub-resolv.conf
+ - force: True
+ - require:
+ - service: hsh_enable_and_restart_systemd_resolved
--
GitLab