From 060cdf4228e779cd6b531c127496be992e41a318 Mon Sep 17 00:00:00 2001
From: Thomas McMurphy <tmcmurphy@cradlepoint.com>
Date: Wed, 16 Aug 2017 15:43:01 +0000
Subject: [PATCH] Remove resolv.conf after purging resolvconf

If there is an existing symlink to resolv.conf then the file.managed
state will fail. Here we resolve that by destroying the resolv.conf
file if we remove resolvconf.
---
 resolver/init.sls | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/resolver/init.sls b/resolver/init.sls
index 57faba3..fe8c89c 100644
--- a/resolver/init.sls
+++ b/resolver/init.sls
@@ -18,6 +18,18 @@ resolvconf-manage:
     - require_in:
       - file: resolv-file
 
+{%- if not is_resolvconf_enabled %}
+remove-symlink:
+  file.absent:
+    - name: /etc/resolv.conf
+    - require:
+      - resolvconf-manage
+    - require_in:
+        - resolv-file
+    - onchanges:
+      - resolvconf-manage
+{%- endif %}
+
 # Resolver Configuration
 resolv-file:
   file.managed: