diff options
| -rw-r--r-- | src/automount.c | 7 | ||||
| -rw-r--r-- | src/path.c | 4 | ||||
| -rw-r--r-- | src/socket.c | 7 | ||||
| -rw-r--r-- | src/timer.c | 4 |
4 files changed, 22 insertions, 0 deletions
diff --git a/src/automount.c b/src/automount.c index 00f3736b2f..e685c96a76 100644 --- a/src/automount.c +++ b/src/automount.c @@ -568,6 +568,13 @@ static void automount_enter_runnning(Automount *a) { dbus_error_init(&error); + /* We don't take mount requests anymore if we are supposed to + * shut down anyway */ + if (a->meta.job && a->meta.job->type == JOB_STOP) { + automount_send_ready(a, -EHOSTDOWN); + return; + } + mkdir_p(a->where, a->directory_mode); /* Before we do anything, let's see if somebody is playing games with us? */ diff --git a/src/path.c b/src/path.c index 27c4544729..2ae6e569ce 100644 --- a/src/path.c +++ b/src/path.c @@ -304,6 +304,10 @@ static void path_enter_running(Path *p) { assert(p); dbus_error_init(&error); + /* Don't start job if we are supposed to go down */ + if (p->meta.job && p->meta.job->type == JOB_STOP) + return; + if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, &error, NULL)) < 0) goto fail; diff --git a/src/socket.c b/src/socket.c index 2d113aef30..f998cada26 100644 --- a/src/socket.c +++ b/src/socket.c @@ -1030,6 +1030,13 @@ static void socket_enter_running(Socket *s, int cfd) { assert(s); dbus_error_init(&error); + /* We don't take connections anymore if we are supposed to + * shut down anyway */ + if (s->meta.job && s->meta.job->type == JOB_STOP) { + close_nointr_nofail(cfd); + return; + } + if (cfd < 0) { if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s->service), JOB_REPLACE, true, &error, NULL)) < 0) goto fail; diff --git a/src/timer.c b/src/timer.c index 1c7010d120..0d4ed27bb4 100644 --- a/src/timer.c +++ b/src/timer.c @@ -268,6 +268,10 @@ static void timer_enter_running(Timer *t) { assert(t); dbus_error_init(&error); + /* Don't start job if we are supposed to go down */ + if (t->meta.job && t->meta.job->type == JOB_STOP) + return; + if ((r = manager_add_job(t->meta.manager, JOB_START, t->unit, JOB_REPLACE, true, &error, NULL)) < 0) goto fail; |