picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

nspawn: voidify more things

Browse source
This commit is contained in:
Lennart Poettering 2018-05-08 08:03:58 -07:00
parent 53e87b5afe
commit 919f5ae0c7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nspawn/nspawn.c
View file

@ -3869,20 +3869,20 @@ static int run(int master,
"STATUS=Container running.\n" "STATUS=Container running.\n"
"X_NSPAWN_LEADER_PID=" PID_FMT, *pid); "X_NSPAWN_LEADER_PID=" PID_FMT, *pid);
if (!arg_notify_ready) if (!arg_notify_ready)
sd_notify(false, "READY=1\n"); (void) sd_notify(false, "READY=1\n");
if (arg_kill_signal > 0) { if (arg_kill_signal > 0) {
/* Try to kill the init system on SIGINT or SIGTERM */ /* Try to kill the init system on SIGINT or SIGTERM */
sd_event_add_signal(event, NULL, SIGINT, on_orderly_shutdown, PID_TO_PTR(*pid)); (void) sd_event_add_signal(event, NULL, SIGINT, on_orderly_shutdown, PID_TO_PTR(*pid));
sd_event_add_signal(event, NULL, SIGTERM, on_orderly_shutdown, PID_TO_PTR(*pid)); (void) sd_event_add_signal(event, NULL, SIGTERM, on_orderly_shutdown, PID_TO_PTR(*pid));
} else { } else {
/* Immediately exit */ /* Immediately exit */
sd_event_add_signal(event, NULL, SIGINT, NULL, NULL); (void) sd_event_add_signal(event, NULL, SIGINT, NULL, NULL);
sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL); (void) sd_event_add_signal(event, NULL, SIGTERM, NULL, NULL);
} }
/* Exit when the child exits */ /* Exit when the child exits */
sd_event_add_signal(event, NULL, SIGCHLD, on_sigchld, PID_TO_PTR(*pid)); (void) sd_event_add_signal(event, NULL, SIGCHLD, on_sigchld, PID_TO_PTR(*pid));
if (arg_expose_ports) { if (arg_expose_ports) {
r = expose_port_watch_rtnl(event, rtnl_socket_pair[0], on_address_change, exposed, &rtnl); r = expose_port_watch_rtnl(event, rtnl_socket_pair[0], on_address_change, exposed, &rtnl);