summaryrefslogtreecommitdiff
path: root/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch')
-rw-r--r--libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch26
1 files changed, 20 insertions, 6 deletions
diff --git a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
index 2c38cc7e3..3e230ad57 100644
--- a/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
+++ b/libre/systemd/0005-FSDG-systemd-resolved-Fallback-hostname-to-gnu-linux.patch
@@ -1,18 +1,32 @@
-From 50b001e3d034825142c03e612af9d4a5a307472f Mon Sep 17 00:00:00 2001
+From 3219b6368eaa5c264d8d5ac1db0d6343abaaeb7f 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 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+diff --git a/man/hostname.xml b/man/hostname.xml
+index a3dae72fd9..6beca463ec 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 01372fc66b..9155ce5c2e 100644
+index b52619e287..f380c23ec4 100644
--- a/src/resolve/resolved-manager.c
+++ b/src/resolve/resolved-manager.c
-@@ -388,7 +388,7 @@
+@@ -373,7 +373,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
@@ -21,7 +35,7 @@ index 01372fc66b..9155ce5c2e 100644
* instead. */
_cleanup_free_ char *n = get_default_hostname();
-@@ -396,7 +396,7 @@
+@@ -381,7 +381,7 @@ static char* fallback_hostname(void) {
return NULL;
if (is_localhost(n))
@@ -31,5 +45,5 @@ index 01372fc66b..9155ce5c2e 100644
return TAKE_PTR(n);
}
--
-2.18.0
+2.44.0