summaryrefslogtreecommitdiff
path: root/src/core/hostname-setup.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2013-05-07 20:55:11 +0200
committerLennart Poettering <lennart@poettering.net>2013-05-07 20:56:41 +0200
commite724b0639c43c2821613fc4f7f755f87c49a22e8 (patch)
tree1c981e6dd6521cd1188abb3ab2536279b5bc3747 /src/core/hostname-setup.c
parent0b95a21bd70f63fc57f62020ae84e467712d69f2 (diff)
hostname: only suppress setting of pretty hostname if it is non-equal to the static hostname and if the static hostname is set, too
https://bugzilla.redhat.com/show_bug.cgi?id=957814
Diffstat (limited to 'src/core/hostname-setup.c')
-rw-r--r--src/core/hostname-setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c
index ac508af122..8aa1cff1d3 100644
--- a/src/core/hostname-setup.c
+++ b/src/core/hostname-setup.c
@@ -42,7 +42,7 @@ static int read_and_strip_hostname(const char *path, char **hn) {
if (r < 0)
return r;
- hostname_cleanup(s);
+ hostname_cleanup(s, false);
if (isempty(s)) {
free(s);