a4023d0c37
- Fix patch tty-ask-password-agent-on-console.patch not to crash away but enable it to ask on all devices of /dev/console - Avoid "file not found /etc/udev/rules.d/70-persistent-net.rules" waring occurring in %post - Add patch let-vconsole-setup-get-properties-only-once-to-copy-them.patch to avoid broken virtual console mapping due stressed ioctl API for the virtual consoles (boo#904214) - Fix last change that is use the new name for udev packages in %pretrans. - restore usage of LUA in %pretrans. - Try to generate the systemd users and groups always in same order to avoid republish other packages (boo#944660) - cleanup specfile by removing commands that were dealing with systemd pre-generated files: we're now using systemd tarball generated directly from the git repo which doesn't contain any of these files. - there's no point in using LUA in %pretrans - Drop 0009-make-xsltproc-use-correct-ROFF-links.patch This patch was initialy added to workaround bsc#842844. But it appears that man(1) was fixed (included since 13.2 at least) to handle manual pages that consist only of a .so directive such as '.so <page>'. - Change use-rndaddentropy-ioctl-to-load-random-seed.patch to make it work on big endian OBS-URL: https://build.opensuse.org/request/show/333777 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=223
32 lines
1.0 KiB
Diff
32 lines
1.0 KiB
Diff
From: Frederic Crozat <fcrozat@suse.com>
|
|
Date: Tue, 28 May 2013 15:17:35 +0200
|
|
Subject: ensure shortname is set as hostname (bnc#820213)
|
|
|
|
strip hostname so the domain part isn't set as part of the hostname
|
|
---
|
|
src/core/hostname-setup.c | 4 ++++
|
|
1 file changed, 4 insertions(+)
|
|
|
|
Index: systemd-221/src/core/hostname-setup.c
|
|
===================================================================
|
|
--- systemd-221.orig/src/core/hostname-setup.c
|
|
+++ systemd-221/src/core/hostname-setup.c
|
|
@@ -34,6 +34,7 @@ int hostname_setup(void) {
|
|
int r;
|
|
_cleanup_free_ char *b = NULL;
|
|
const char *hn;
|
|
+ char *domain;
|
|
bool enoent = false;
|
|
|
|
r = read_hostname_config("/etc/hostname", &b);
|
|
@@ -46,6 +47,9 @@ int hostname_setup(void) {
|
|
hn = NULL;
|
|
} else
|
|
hn = b;
|
|
+ /* strip any leftover of a domain name */
|
|
+ if ((domain = strchr(hn, '.')) != NULL)
|
|
+ *domain = '\0';
|
|
|
|
if (isempty(hn)) {
|
|
/* Don't override the hostname if it is already set
|