forked from pool/systemd
2ce609fe24
- Ensure /usr/lib/systemd/system/shutdown.target.wants is created and owned by systemd package. (forwarded request 185494 from fcrozat) OBS-URL: https://build.opensuse.org/request/show/185496 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=151
33 lines
864 B
Diff
33 lines
864 B
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 | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
--- systemd-206.orig/src/core/hostname-setup.c
|
|
+++ systemd-206/src/core/hostname-setup.c
|
|
@@ -32,7 +32,7 @@
|
|
#include "fileio.h"
|
|
|
|
static int read_and_strip_hostname(const char *path, char **hn) {
|
|
- char *s;
|
|
+ char *s, *domain;
|
|
int r;
|
|
|
|
assert(path);
|
|
@@ -49,6 +49,11 @@ static int read_and_strip_hostname(const
|
|
return -ENOENT;
|
|
}
|
|
|
|
+ /* strip any leftover of a domain name */
|
|
+ if (domain = strchr(s, '.')) {
|
|
+ *domain = NULL;
|
|
+ }
|
|
+
|
|
*hn = s;
|
|
return 0;
|
|
}
|