diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-25 12:49:37 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-05-25 17:45:35 -0400 |
| commit | 3d271810cb33579af657475407a5c3157375cb80 (patch) | |
| tree | 129cbc975f29682735536fdec40addccec974ccf /libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch | |
| parent | a99d37e8cf3cefec2e59be2afc507559b3e94f6a (diff) | |
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]".
Diffstat (limited to 'libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch')
| -rw-r--r-- | libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch b/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch new file mode 100644 index 000000000..d6c40587d --- /dev/null +++ b/libre/systemd/0003-FSDG-os-release-Default-to-NAME-GNU-Linux-instead-of.patch @@ -0,0 +1,40 @@ +From 20c90fb1a90a1702ce5e7d79dd16ee160640a1ee Mon Sep 17 00:00:00 2001 +From: Luke Shumaker <lukeshu@sbcglobal.net> +Date: Wed, 25 May 2016 12:24:56 -0400 +Subject: [PATCH 3/6] FSDG: os-release: Default to NAME "GNU/Linux" instead of + "Linux". + +--- + man/os-release.xml | 2 +- + src/journal-remote/journal-gatewayd.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/man/os-release.xml b/man/os-release.xml +index 767a1c7..f6787f9 100644 +--- a/man/os-release.xml ++++ b/man/os-release.xml +@@ -121,7 +121,7 @@ + <listitem><para>A string identifying the operating system, + without a version component, and suitable for presentation to + the user. If not set, defaults to +- <literal>NAME=Linux</literal>. Example: ++ <literal>NAME=GNU/Linux</literal>. Example: + <literal>NAME=Fedora</literal> or <literal>NAME="Debian + GNU/Linux"</literal>.</para></listitem> + </varlistentry> +diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c +index 60d8977..3b9adb5 100644 +--- a/src/journal-remote/journal-gatewayd.c ++++ b/src/journal-remote/journal-gatewayd.c +@@ -799,7 +799,7 @@ static int request_handler_machine( + SD_ID128_FORMAT_VAL(mid), + SD_ID128_FORMAT_VAL(bid), + hostname_cleanup(hostname), +- os_name ? os_name : "Linux", ++ os_name ? os_name : "GNU/Linux", + v ? v : "bare", + usage, + cutoff_from, +-- +2.8.3 + |