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_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"),
+ NM_UTILS_LOOKUP_ITEM_IGNORE (_NM_DNS_MANAGER_RESOLV_CONF_MAN_INTERNAL_ONLY),
);
static void
}
static gboolean
-write_resolv_conf (FILE *f,
- char **searches,
- char **nameservers,
- char **options,
- GError **error)
+write_resolv_conf_contents (FILE *f,
+ const char *content,
+ GError **error)
{
- gs_free char *content = NULL;
-
- content = create_resolv_conf (searches, nameservers, options);
if (fprintf (f, "%s", content) < 0) {
g_set_error (error,
NM_MANAGER_ERROR,
return TRUE;
}
+static gboolean
+write_resolv_conf (FILE *f,
+ char **searches,
+ char **nameservers,
+ char **options,
+ GError **error)
+{
+ gs_free char *content = NULL;
+
+ content = create_resolv_conf (searches, nameservers, options);
+ return write_resolv_conf_contents (f, content, error);
+}
+
static SpawnResult
dispatch_resolvconf (NMDnsManager *self,
char **searches,
char **nameservers,
char **options,
GError **error,
- gboolean install_etc)
+ NMDnsManagerResolvConfManager rc_manager)
{
FILE *f;
struct stat st;
gboolean success;
+ gs_free char *content = NULL;
+ SpawnResult write_file_result = SR_SUCCESS;
/* If we are not managing /etc/resolv.conf and it points to
* MY_RESOLV_CONF, don't write the private DNS configuration to
* MY_RESOLV_CONF otherwise we would overwrite the changes done by
* some external application.
- */
- if (!install_etc) {
+ *
+ * This is the only situation, where we don't try to update our
+ * internal resolv.conf file. */
+ if (rc_manager == _NM_DNS_MANAGER_RESOLV_CONF_MAN_INTERNAL_ONLY) {
gs_free char *path = g_file_read_link (_PATH_RESCONF, NULL);
if (g_strcmp0 (path, MY_RESOLV_CONF) == 0) {
}
}
+ content = create_resolv_conf (searches, nameservers, options);
+
+ if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE) {
+ /* we first write to /etc/resolv.conf directly. If that fails,
+ * we still continue to write to runstatedir but remember the
+ * error. */
+ if (!g_file_set_contents (_PATH_RESCONF, content, -1, error)) {
+ write_file_result = SR_ERROR;
+ error = NULL;
+ }
+ }
+
if ((f = fopen (MY_RESOLV_CONF_TMP, "w")) == NULL) {
g_set_error (error,
NM_MANAGER_ERROR,
return SR_ERROR;
}
- success = write_resolv_conf (f, searches, nameservers, options, error);
+ success = write_resolv_conf_contents (f, content, error);
if (fclose (f) < 0) {
if (success) {
return SR_ERROR;
}
- if (!install_etc)
+ if (rc_manager == NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE)
+ return write_file_result;
+
+ if (rc_manager != NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE)
return SR_SUCCESS;
/* A symlink pointing to NM's own resolv.conf (MY_RESOLV_CONF) is always
if (update) {
switch (priv->rc_manager) {
case NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE:
- result = update_resolv_conf (self, searches, nameservers, options, error, TRUE);
+ case NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE:
+ result = update_resolv_conf (self, searches, nameservers, options, error, priv->rc_manager);
resolv_conf_updated = TRUE;
break;
case NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF:
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, TRUE);
+ result = update_resolv_conf (self, searches, nameservers, options, error, NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE);
resolv_conf_updated = TRUE;
}
}
/* Unless we've already done it, update private resolv.conf in NMRUNDIR
ignoring any errors */
if (!resolv_conf_updated)
- update_resolv_conf (self, searches, nameservers, options, NULL, FALSE);
+ update_resolv_conf (self, searches, nameservers, options, NULL, _NM_DNS_MANAGER_RESOLV_CONF_MAN_INTERNAL_ONLY);
/* signal that resolv.conf was changed */
if (update && result == SR_SUCCESS)
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;
+ else if (nm_streq0 (man, "file"))
+ priv->rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE;
else if (!g_strcmp0 (man, "resolvconf"))
priv->rc_manager = NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF;
else if (!g_strcmp0 (man, "netconfig"))
/**
* NMDnsManagerResolvConfManager
- * @NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE: NM directly writes resolv.conf
+ * @_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
+ * 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_RESOLVCONF: NM is managing resolv.conf
through resolvconf
* @NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG: NM is managing resolv.conf
* NMDnsManager's management of resolv.conf
*/
typedef enum {
+ _NM_DNS_MANAGER_RESOLV_CONF_MAN_INTERNAL_ONLY,
NM_DNS_MANAGER_RESOLV_CONF_MAN_NONE,
+ NM_DNS_MANAGER_RESOLV_CONF_MAN_FILE,
NM_DNS_MANAGER_RESOLV_CONF_MAN_RESOLVCONF,
NM_DNS_MANAGER_RESOLV_CONF_MAN_NETCONFIG,
} NMDnsManagerResolvConfManager;