X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fautomount.c;h=9447c0d8fcf81af7c3c3a169bc4bccd70741ca90;hb=721bca5763a9e2befebc84b37c6d537990d4ce6e;hp=b45cbcf53380171efeacbaa571ae5dc2a560ec52;hpb=2a77d31df976c3934e3b38a9e61c000ec9a8acc2;p=elogind.git diff --git a/src/automount.c b/src/automount.c index b45cbcf53..9447c0d8f 100644 --- a/src/automount.c +++ b/src/automount.c @@ -244,7 +244,7 @@ static void automount_set_state(Automount *a, AutomountState state) { automount_state_to_string(old_state), automount_state_to_string(state)); - unit_notify(UNIT(a), state_translation_table[old_state], state_translation_table[state]); + unit_notify(UNIT(a), state_translation_table[old_state], state_translation_table[state], true); } static int automount_coldplug(Unit *u) { @@ -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; }