From 3d271810cb33579af657475407a5c3157375cb80 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Wed, 25 May 2016 12:49:37 -0400 Subject: libre/systemd: Split gnu+linux.patch into multiple patches, tidy them up. I removed several instances of replacing "Linux" with "GNU/Linux" in man pages where it was (correctly) referring to kernel, not the complete operating system. In the FSDG-distros patch, I added " (Spartakus)" to several BLAG examples, as appropriate. Also, some of the linebreaks were in bad locations with the XML. I also added a patch to systemd-resolved to have the default hostname be "gnu-linux[.local]" instead of "linux[.local]". --- ...d-resolved-Default-to-hostname-gnu-linux-.patch | 33 ++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch (limited to 'libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch') diff --git a/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch b/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch new file mode 100644 index 000000000..f5e9de8fc --- /dev/null +++ b/libre/systemd/0005-FSDG-systemd-resolved-Default-to-hostname-gnu-linux-.patch @@ -0,0 +1,33 @@ +From 71b8c10050db1a16402e0600c9921b012c908b44 Mon Sep 17 00:00:00 2001 +From: Luke Shumaker +Date: Wed, 25 May 2016 12:31:20 -0400 +Subject: [PATCH 5/6] FSDG: systemd-resolved: Default to hostname "gnu-linux" + instead of "linux" + +--- + src/resolve/resolved-manager.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/resolve/resolved-manager.c b/src/resolve/resolved-manager.c +index 7f90734..e82c6ec 100644 +--- a/src/resolve/resolved-manager.c ++++ b/src/resolve/resolved-manager.c +@@ -429,12 +429,12 @@ static int manager_watch_hostname(Manager *m) { + + r = determine_hostname(&m->llmnr_hostname, &m->mdns_hostname); + if (r < 0) { +- log_info("Defaulting to hostname 'linux'."); +- m->llmnr_hostname = strdup("linux"); ++ log_info("Defaulting to hostname 'gnu-linux'."); ++ m->llmnr_hostname = strdup("gnu-linux"); + if (!m->llmnr_hostname) + return log_oom(); + +- m->mdns_hostname = strdup("linux.local"); ++ m->mdns_hostname = strdup("gnu-linux.local"); + if (!m->mdns_hostname) + return log_oom(); + } else +-- +2.8.3 + -- cgit v1.2.3-2-g168b