chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kmsg-syslogd: fix build
[elogind.git]
/
src
/
automount.c
diff --git
a/src/automount.c
b/src/automount.c
index b45cbcf53380171efeacbaa571ae5dc2a560ec52..9447c0d8fcf81af7c3c3a169bc4bccd70741ca90 100644
(file)
--- 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));
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) {
}
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 */
/* 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;
}
automount_send_ready(a, -EHOSTDOWN);
return;
}