diff options
author | Lennart Poettering <lennart@poettering.net> | 2013-05-07 20:55:11 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2013-05-07 20:56:41 +0200 |
commit | e724b0639c43c2821613fc4f7f755f87c49a22e8 (patch) | |
tree | 1c981e6dd6521cd1188abb3ab2536279b5bc3747 /src/nspawn | |
parent | 0b95a21bd70f63fc57f62020ae84e467712d69f2 (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/nspawn')
-rw-r--r-- | src/nspawn/nspawn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index a58cbec38a..09153c87ce 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1267,7 +1267,7 @@ int main(int argc, char *argv[]) { goto finish; } - hostname_cleanup(arg_machine); + hostname_cleanup(arg_machine, false); if (isempty(arg_machine)) { log_error("Failed to determine machine name automatically, please use -M."); goto finish; |