From b952f54cb1a54efa07ec2d4dda207bf31bd0ef72 Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Thu, 21 Apr 2016 18:44:48 +0200
Subject: [PATCH] dns: add new rc-manager=unmanaged

The following settings are effectively identical:

    dns=none,rc-manager=*any*
    dns=none,rc-manager=unmanaged
    dns=default,rc-manager=unmanaged

The new setting is only there for completeness and only
makes sense for a dns plugin.

(cherry picked from commit 2789345d5b5047c67f93def77e581e076a252d74)
---
 man/NetworkManager.conf.xml      | 5 ++++-
 src/dns-manager/nm-dns-manager.c | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml
index 5ab3432d00..54ad4e1584 100644
--- a/man/NetworkManager.conf.xml
+++ b/man/NetworkManager.conf.xml
@@ -303,7 +303,8 @@ no-auto-default=*
         configuration with DNSSEC support. The /etc/resolv.conf
         will be managed by dnssec-trigger daemon.</para>
         <para><literal>none</literal>: NetworkManager will not
-        modify resolv.conf.</para>
+        modify resolv.conf. This implies <varname>rc-manager</varname>
+        <literal>unmanaged</literal></para>
         </listitem>
       </varlistentry>
 
@@ -322,6 +323,8 @@ no-auto-default=*
         resolvconf to update the DNS configuration.</para>
         <para><literal>netconfig</literal>: NetworkManager will run
         netconfig to update the DNS configuration.</para>
+        <para><literal>unmanaged</literal>: don't touch
+        <filename>resolv.conf</filename>.</para>
         <para><literal>none</literal>: deprecated alias for
         <literal>symlink</literal>.</para>
         </listitem>
diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c
index 9478e9b579..9cb8a0f072 100644
--- a/src/dns-manager/nm-dns-manager.c
+++ b/src/dns-manager/nm-dns-manager.c
@@ -1470,6 +1470,8 @@ _get_resolv_conf_manager (NMConfig *config)
 		return NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF;
 	if (nm_streq (man, "netconfig"))
 		return NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG;
+	if (nm_streq (man, "unmanaged"))
+		return NM_DNS_MANAGER_RESOLV_CONF_MAN_UNMANAGED;
 
 	return NM_DNS_MANAGER_RESOLV_CONF_MAN_UNKNOWN;
 }