colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ifcfg-rh: put \n after hostname when writing it to /etc/hostname

Browse Source
This commit is contained in:
Jiří Klimeš
2014-03-26 16:23:54 +01:00
parent da354830da
commit a2597c0816
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/settings/plugins/ifcfg-rh/plugin.c
View File

@@ -673,6 +673,7 @@ plugin_set_hostname (SCPluginIfcfg *plugin, const char *hostname)
{ {
SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin); SCPluginIfcfgPrivate *priv = SC_PLUGIN_IFCFG_GET_PRIVATE (plugin);
shvarFile *network; shvarFile *network;
char *hostname_eol;
gboolean ret; gboolean ret;
#if HAVE_SELINUX #if HAVE_SELINUX
security_context_t se_ctx_prev, se_ctx = NULL; security_context_t se_ctx_prev, se_ctx = NULL;
@@ -686,7 +687,8 @@ plugin_set_hostname (SCPluginIfcfg *plugin, const char *hostname)
setfscreatecon (se_ctx); setfscreatecon (se_ctx);
#endif #endif
ret = g_file_set_contents (HOSTNAME_FILE, hostname, -1, NULL); hostname_eol = g_strdup_printf ("%s\n", hostname);
ret = g_file_set_contents (HOSTNAME_FILE, hostname_eol, -1, NULL);
#if HAVE_SELINUX #if HAVE_SELINUX
/* Restore previous context and cleanup */ /* Restore previous context and cleanup */
@@ -697,11 +699,13 @@ plugin_set_hostname (SCPluginIfcfg *plugin, const char *hostname)
if (!ret) { if (!ret) {
PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Could not save hostname: failed to create/open " HOSTNAME_FILE); PLUGIN_WARN (IFCFG_PLUGIN_NAME, "Could not save hostname: failed to create/open " HOSTNAME_FILE);
g_free (hostname_eol);
return FALSE; return FALSE;
} }
g_free (priv->hostname); g_free (priv->hostname);
priv->hostname = g_strdup (hostname); priv->hostname = g_strdup (hostname);
g_free (hostname_eol);
/* Remove "HOSTNAME" from SC_NETWORK_FILE, if present */ /* Remove "HOSTNAME" from SC_NETWORK_FILE, if present */
network = svNewFile (SC_NETWORK_FILE); network = svNewFile (SC_NETWORK_FILE);