Commit ba3e67a7 authored by Lennart Poettering's avatar Lennart Poettering
Browse files

socket: when the socket is supposed to stop, don't accept any connections anymore

parent a974d58e
...@@ -568,6 +568,13 @@ static void automount_enter_runnning(Automount *a) { ...@@ -568,6 +568,13 @@ static void automount_enter_runnning(Automount *a) {
dbus_error_init(&error); 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); mkdir_p(a->where, a->directory_mode);
/* Before we do anything, let's see if somebody is playing games with us? */ /* Before we do anything, let's see if somebody is playing games with us? */
......
...@@ -304,6 +304,10 @@ static void path_enter_running(Path *p) { ...@@ -304,6 +304,10 @@ static void path_enter_running(Path *p) {
assert(p); assert(p);
dbus_error_init(&error); 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) if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, &error, NULL)) < 0)
goto fail; goto fail;
......
...@@ -1030,6 +1030,13 @@ static void socket_enter_running(Socket *s, int cfd) { ...@@ -1030,6 +1030,13 @@ static void socket_enter_running(Socket *s, int cfd) {
assert(s); assert(s);
dbus_error_init(&error); 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 (cfd < 0) {
if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s->service), JOB_REPLACE, true, &error, NULL)) < 0) if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s->service), JOB_REPLACE, true, &error, NULL)) < 0)
goto fail; goto fail;
......
...@@ -268,6 +268,10 @@ static void timer_enter_running(Timer *t) { ...@@ -268,6 +268,10 @@ static void timer_enter_running(Timer *t) {
assert(t); assert(t);
dbus_error_init(&error); 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) if ((r = manager_add_job(t->meta.manager, JOB_START, t->unit, JOB_REPLACE, true, &error, NULL)) < 0)
goto fail; goto fail;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment