chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
load: make sure that unit files in /etc/ always take precedence, even over link targe...
[elogind.git]
/
src
/
automount.c
diff --git
a/src/automount.c
b/src/automount.c
index 00f3736b2fc148c9eb5bf0bb223eca8073177dd3..213b178eaebd3744c43e0d0784dd84f1129fb8a0 100644
(file)
--- a/
src/automount.c
+++ b/
src/automount.c
@@
-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);
/* Before we do anything, let's see if somebody is playing games with us? */
mkdir_p(a->where, a->directory_mode);
/* Before we do anything, let's see if somebody is playing games with us? */
@@
-784,6
+791,17
@@
static void automount_shutdown(Manager *m) {
close_nointr_nofail(m->dev_autofs_fd);
}
close_nointr_nofail(m->dev_autofs_fd);
}
+static void automount_reset_maintenance(Unit *u) {
+ Automount *a = AUTOMOUNT(u);
+
+ assert(a);
+
+ if (a->state == AUTOMOUNT_MAINTENANCE)
+ automount_set_state(a, AUTOMOUNT_DEAD);
+
+ a->failure = false;
+}
+
static const char* const automount_state_table[_AUTOMOUNT_STATE_MAX] = {
[AUTOMOUNT_DEAD] = "dead",
[AUTOMOUNT_WAITING] = "waiting",
static const char* const automount_state_table[_AUTOMOUNT_STATE_MAX] = {
[AUTOMOUNT_DEAD] = "dead",
[AUTOMOUNT_WAITING] = "waiting",
@@
-820,6
+838,8
@@
const UnitVTable automount_vtable = {
.fd_event = automount_fd_event,
.fd_event = automount_fd_event,
+ .reset_maintenance = automount_reset_maintenance,
+
.bus_message_handler = bus_automount_message_handler,
.shutdown = automount_shutdown
.bus_message_handler = bus_automount_message_handler,
.shutdown = automount_shutdown