From 8a68c929561dc11b21e02189d4405ce797b82ab3 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Thu, 21 Apr 2016 16:41:40 +0200 Subject: [PATCH] dns: rename "rc-manager=none" to "symlink" We already have "rc-manager=file", rename "rc-manager=none" to "symlink" because that better describes what it is actually doing. Of course, the old name is still accepted. (cherry picked from commit cd6a469668028fbc347919ed3580275f9894a1f2) --- man/NetworkManager.conf.xml | 4 +++- src/dns-manager/nm-dns-manager.c | 14 +++++++------- src/dns-manager/nm-dns-manager.h | 8 ++++---- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/man/NetworkManager.conf.xml b/man/NetworkManager.conf.xml index 9b53ce993e..5ab3432d00 100644 --- a/man/NetworkManager.conf.xml +++ b/man/NetworkManager.conf.xml @@ -313,7 +313,7 @@ no-auto-default=* management mode. The default value depends on how NetworkManager was built. Regardless of this setting, NetworkManager will always write resolv.conf to its runtime state directory. - none: NetworkManager will symlink + symlink: NetworkManager will symlink /etc/resolv.conf to its private resolv.conf file in the runtime state directory. file: NetworkManager will write @@ -322,6 +322,8 @@ no-auto-default=* resolvconf to update the DNS configuration. netconfig: NetworkManager will run netconfig to update the DNS configuration. + none: deprecated alias for + symlink. diff --git a/src/dns-manager/nm-dns-manager.c b/src/dns-manager/nm-dns-manager.c index d5817bb451..a16532e2b8 100644 --- a/src/dns-manager/nm-dns-manager.c +++ b/src/dns-manager/nm-dns-manager.c @@ -164,7 +164,7 @@ typedef struct { NM_UTILS_LOOKUP_STR_DEFINE_STATIC (_rc_manager_to_string, NMDnsManagerResolvConfManager, NM_UTILS_LOOKUP_DEFAULT_WARN (NULL), - NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE, "none"), + NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK, "symlink"), NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE, "file"), NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF, "resolvconf"), NM_UTILS_LOOKUP_STR_ITEM (NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG, "netconfig"), @@ -673,7 +673,7 @@ update_resolv_conf (NMDnsManager *self, return write_file_result; } - if (rc_manager != NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE) { + if (rc_manager != NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK) { _LOGT ("update-resolv-conf: write internal file %s succeeded", MY_RESOLV_CONF); return SR_SUCCESS; } @@ -1068,7 +1068,7 @@ update_dns (NMDnsManager *self, if (update) { switch (priv->rc_manager) { - case NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE: + case NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK: case NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE: result = update_resolv_conf (self, searches, nameservers, options, error, priv->rc_manager); resolv_conf_updated = TRUE; @@ -1087,7 +1087,7 @@ update_dns (NMDnsManager *self, if (result == SR_NOTFOUND) { _LOGD ("update-dns: program not available, writing to resolv.conf"); g_clear_error (error); - result = update_resolv_conf (self, searches, nameservers, options, error, NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE); + result = update_resolv_conf (self, searches, nameservers, options, error, NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK); resolv_conf_updated = TRUE; } } @@ -1512,8 +1512,8 @@ init_resolv_conf_manager (NMDnsManager *self) const char *man; man = nm_config_data_get_rc_manager (nm_config_get_data (priv->config)); - if (!g_strcmp0 (man, "none")) - priv->rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE; + if (NM_IN_STRSET (man, "symlink", "none")) + priv->rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK; else if (nm_streq0 (man, "file")) priv->rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE; else if (!g_strcmp0 (man, "resolvconf")) @@ -1526,7 +1526,7 @@ init_resolv_conf_manager (NMDnsManager *self) #elif defined(NETCONFIG_SELECTED) priv->rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG; #else - priv->rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE; + priv->rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK; #endif if (man) _LOGW ("unknown resolv.conf manager '%s'", man); diff --git a/src/dns-manager/nm-dns-manager.h b/src/dns-manager/nm-dns-manager.h index 37f104ad36..1f169299f7 100644 --- a/src/dns-manager/nm-dns-manager.h +++ b/src/dns-manager/nm-dns-manager.h @@ -110,10 +110,10 @@ typedef enum { * @_NM_DNS_MANAGER_RESOLV_CONF_MAN_INTERNAL_ONLY: dummy-manager * to not write resolv.conf at all, only the internal file in * NM's run state directory. - * @NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE: NM writes resolv.conf + * @NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK: NM writes resolv.conf * by symlinking it to the run state directory. - * @NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE: Like NONE, but instead of symlinking - * resolv.conf, write it as a file. + * @NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE: Like SYMLINK, but instead of + * symlinking /etc/resolv.conf, write it as a file. * @NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF: NM is managing resolv.conf through resolvconf * @NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG: NM is managing resolv.conf @@ -123,7 +123,7 @@ typedef enum { */ typedef enum { _NM_DNS_MANAGER_RESOLV_CONF_MAN_INTERNAL_ONLY, - NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE, + NM_DNS_MANAGER_RESOLV_CONF_MAN_SYMLINK, NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE, NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF, NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG,