summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-01-26 02:55:35 +0100
committerLennart Poettering <lennart@poettering.net>2011-01-26 02:55:35 +0100
commit5d909e3ec3f502f1d33d0070d8a7a5755e7615d8 (patch)
tree9255c14f9a7ebd409c359f8c0d8ab18dbe51777d /src
parent0238cd03def0dc5ff2c246563372c0d523b86505 (diff)
automount: use unit_pending_inactive() where appropriate
Diffstat (limited to 'src')
-rw-r--r--src/automount.c3
-rw-r--r--src/socket.c2
2 files changed, 4 insertions, 1 deletions
diff --git a/src/automount.c b/src/automount.c
index 0ae467cbd4..9447c0d8fc 100644
--- a/src/automount.c
+++ b/src/automount.c
@@ -573,7 +573,8 @@ static void automount_enter_runnning(Automount *a) {
/* 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) {
+ if (unit_pending_inactive(UNIT(a))) {
+ log_debug("Suppressing automount request on %s since unit stop is scheduled.", a->meta.id);
automount_send_ready(a, -EHOSTDOWN);
return;
}
diff --git a/src/socket.c b/src/socket.c
index 4443dba0c9..e386c7f297 100644
--- a/src/socket.c
+++ b/src/socket.c
@@ -1189,6 +1189,8 @@ static void socket_enter_running(Socket *s, int cfd) {
/* We don't take connections anymore if we are supposed to
* shut down anyway */
if (unit_pending_inactive(UNIT(s))) {
+ log_debug("Suppressing connection request on %s since unit stop is scheduled.", s->meta.id);
+
if (cfd >= 0)
close_nointr_nofail(cfd);
else {