summaryrefslogtreecommitdiff
path: root/src/nspawn
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-09-23 01:32:44 +0200
committerLennart Poettering <lennart@poettering.net>2015-09-29 21:08:37 +0200
commit189d5bac5c45a6a735489541e285dec8bfc1d38d (patch)
tree955cf1bb252323c0f7720d88971de65ddbc0a290 /src/nspawn
parente6e242ad2d5f72573ceb4442242789aa23962cd2 (diff)
downloadsystemd-189d5bac5c45a6a735489541e285dec8bfc1d38d.tar.gz
systemd-189d5bac5c45a6a735489541e285dec8bfc1d38d.tar.bz2
systemd-189d5bac5c45a6a735489541e285dec8bfc1d38d.zip
util: unify implementation of NOP signal handler
This is highly complex code after all, we really should make sure to only keep one implementation of this extremely difficult function around.
Diffstat (limited to 'src/nspawn')
-rw-r--r--src/nspawn/nspawn.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
index cb4e87fd74..6b5d5d5b75 100644
--- a/src/nspawn/nspawn.c
+++ b/src/nspawn/nspawn.c
@@ -2282,8 +2282,6 @@ static int wait_for_container(pid_t pid, ContainerStatus *container) {
return r;
}
-static void nop_handler(int sig) {}
-
static int on_orderly_shutdown(sd_event_source *s, const struct signalfd_siginfo *si, void *userdata) {
pid_t pid;
@@ -3241,7 +3239,7 @@ int main(int argc, char *argv[]) {
ContainerStatus container_status;
_cleanup_(barrier_destroy) Barrier barrier = BARRIER_NULL;
static const struct sigaction sa = {
- .sa_handler = nop_handler,
+ .sa_handler = nop_signal_handler,
.sa_flags = SA_NOCLDSTOP,
};
int ifi = 0;