Commit 6160888e authored by Patrick J. Volkerding's avatar Patrick J. Volkerding Committed by Thomas Haller

hostname-manager: use fqdn for persistent hostname on Slackware

This will be the default for Slackware 15.0 and on.

This should be safe for both master and 1.12.x stable branch, as
no existing Slackware releases are expected to run NM-1.12.x or
later.
Signed-off-by: 's avatarRobby Workman <rworkman@slackware.com>

https://mail.gnome.org/archives/networkmanager-list/2019-May/msg00011.html

(cherry picked from commit e1df17e0)
(cherry picked from commit 065e8104)
parent 7a0f8520
Pipeline #37689 failed with stage
in 30 minutes and 35 seconds
......@@ -131,8 +131,7 @@ read_hostname_slackware (const char *path)
{
gs_free char *contents = NULL;
gs_strfreev char **all_lines = NULL;
char *tmp;
guint i, j = 0;
guint i = 0;
if (!g_file_get_contents (path, &contents, NULL, NULL))
return NULL;
......@@ -142,17 +141,7 @@ read_hostname_slackware (const char *path)
g_strstrip (all_lines[i]);
if (all_lines[i][0] == '#' || all_lines[i][0] == '\0')
continue;
tmp = &all_lines[i][0];
/* We only want up to the first '.' -- the rest of the */
/* fqdn is defined in /etc/hosts */
while (tmp[j] != '\0') {
if (tmp[j] == '.') {
tmp[j] = '\0';
break;
}
j++;
}
return g_shell_unquote (tmp, NULL);
return g_shell_unquote (&all_lines[i][0], NULL);
}
return NULL;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment