1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950 |
- From 75ea90fc45e5d404ca7e2495b175f77c906ac7bb Mon Sep 17 00:00:00 2001
- From: Luke Shumaker <lukeshu@parabola.nu>
- Date: Wed, 25 May 2016 12:31:20 -0400
- Subject: [PATCH 5/7] FSDG: systemd-resolved: Fallback hostname to "gnu-linux"
- instead of "linux"
- ---
- man/hostname.xml | 2 +-
- src/resolve/resolved-manager.c | 4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
- diff --git a/man/hostname.xml b/man/hostname.xml
- index 746de21cd1..8960cf4a06 100644
- --- a/man/hostname.xml
- +++ b/man/hostname.xml
- @@ -79,7 +79,7 @@
- <listitem><para>Otherwise, a fallback hostname configured at compilation time will be used
- (<literal>&FALLBACK_HOSTNAME;</literal>).</para></listitem>
-
- - <!-- what about the "linux" fallback fallback? -->
- + <!-- what about the "gnu-linux" fallback? -->
- </itemizedlist>
-
- <para>Effectively, the static hostname has higher priority than a transient hostname, which has higher
- diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c
- index 99787f7822..ca24918041 100644
- --- a/src/resolve/resolved-manager.c
- +++ b/src/resolve/resolved-manager.c
- @@ -374,7 +374,7 @@ static int determine_hostnames(char **full_hostname, char **llmnr_hostname, char
- static char* fallback_hostname(void) {
-
- /* Determine the fall back hostname. For exposing this system to the outside world, we cannot have it
- - * to be "localhost" even if that's the default hostname. In this case, let's revert to "linux"
- + * to be "localhost" even if that's the default hostname. In this case, let's revert to "gnu-linux"
- * instead. */
-
- _cleanup_free_ char *n = get_default_hostname();
- @@ -382,7 +382,7 @@ static char* fallback_hostname(void) {
- return NULL;
-
- if (is_localhost(n))
- - return strdup("linux");
- + return strdup("gnu-linux");
-
- return TAKE_PTR(n);
- }
- --
- 2.45.2
|