chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
systemctl: show sysv path if it is set if the fragment path isn't in systemctl status
[elogind.git]
/
src
/
automount.c
diff --git
a/src/automount.c
b/src/automount.c
index 00f3736b2fc148c9eb5bf0bb223eca8073177dd3..f81d5a2c7f41b205e7247f6c5ef1ec9dfdcbea0b 100644
(file)
--- a/
src/automount.c
+++ b/
src/automount.c
@@
-37,6
+37,7
@@
#include "dbus-automount.h"
#include "bus-errors.h"
#include "special.h"
#include "dbus-automount.h"
#include "bus-errors.h"
#include "special.h"
+#include "label.h"
static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
[AUTOMOUNT_DEAD] = UNIT_INACTIVE,
static const UnitActiveState state_translation_table[_AUTOMOUNT_STATE_MAX] = {
[AUTOMOUNT_DEAD] = UNIT_INACTIVE,
@@
-153,10
+154,10
@@
static int automount_add_default_dependencies(Automount *a) {
if (a->meta.manager->running_as == MANAGER_SYSTEM) {
if (a->meta.manager->running_as == MANAGER_SYSTEM) {
- if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_
SYSINIT
_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_dependency_by_name(UNIT(a), UNIT_AFTER, SPECIAL_
FSCK
_TARGET, NULL, true)) < 0)
return r;
return r;
- if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICT
S
, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
+ if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICT
ED_BY
, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}
return r;
}
@@
-304,6
+305,8
@@
static int open_dev_autofs(Manager *m) {
if (m->dev_autofs_fd >= 0)
return m->dev_autofs_fd;
if (m->dev_autofs_fd >= 0)
return m->dev_autofs_fd;
+ label_fix("/dev/autofs");
+
if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) {
log_error("Failed to open /dev/autofs: %s", strerror(errno));
return -errno;
if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) {
log_error("Failed to open /dev/autofs: %s", strerror(errno));
return -errno;
@@
-442,6
+445,8
@@
int automount_send_ready(Automount *a, int status) {
else
log_debug("Sending success.");
else
log_debug("Sending success.");
+ r = 0;
+
/* Autofs thankfully does not hand out 0 as a token */
while ((token = PTR_TO_UINT(set_steal_first(a->tokens)))) {
int k;
/* Autofs thankfully does not hand out 0 as a token */
while ((token = PTR_TO_UINT(set_steal_first(a->tokens)))) {
int k;
@@
-458,8
+463,6
@@
int automount_send_ready(Automount *a, int status) {
r = k;
}
r = k;
}
- r = 0;
-
fail:
if (ioctl_fd >= 0)
close_nointr_nofail(ioctl_fd);
fail:
if (ioctl_fd >= 0)
close_nointr_nofail(ioctl_fd);
@@
-568,6
+571,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
+794,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
+841,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