shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

nspawn: properly handle and log about hostname setting errors

Browse Source
This commit is contained in:
Lennart Poettering 2018-05-07 20:45:39 +02:00
parent 9f8168eb23
commit c818eef1cd
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/nspawn/nspawn.c
View File

@ -1791,12 +1791,14 @@ static int on_address_change(sd_netlink *rtnl, sd_netlink_message *m, void *user
}
static int setup_hostname(void) {
int r;
if ((arg_clone_ns_flags & CLONE_NEWUTS) == 0)
return 0;
if (sethostname_idempotent(arg_hostname ?: arg_machine) < 0)
return -errno;
r = sethostname_idempotent(arg_hostname ?: arg_machine);
if (r < 0)
return log_error_errno(r, "Failed to set hostname: %m");
return 0;
}
@ -2453,7 +2455,7 @@ static int inner_child(
if (r < 0)
return log_error_errno(r, "drop_capabilities() failed: %m");
setup_hostname();
(void) setup_hostname();
if (arg_personality != PERSONALITY_INVALID) {
r = safe_personality(arg_personality);