chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journal: add new system-cat tool as kind of a more powerfull BSD logger
[elogind.git]
/
src
/
automount.c
diff --git
a/src/automount.c
b/src/automount.c
index 462f3170bac7acbecbb02c94acc7a695f6f76bbb..b70f8b4684ad64d82c1fabe6a346219d5ecf418d 100644
(file)
--- a/
src/automount.c
+++ b/
src/automount.c
@@
-58,6
+58,8
@@
static void automount_init(Unit *u) {
a->pipe_watch.type = WATCH_INVALID;
a->directory_mode = 0755;
a->pipe_watch.type = WATCH_INVALID;
a->directory_mode = 0755;
+
+ a->meta.ignore_on_isolate = true;
}
static void repeat_unmout(const char *path) {
}
static void repeat_unmout(const char *path) {
@@
-103,7
+105,7
@@
static void automount_done(Unit *u) {
assert(a);
unmount_autofs(a);
assert(a);
unmount_autofs(a);
-
a->mount = NULL
;
+
unit_ref_unset(&a->mount)
;
free(a->where);
a->where = NULL;
free(a->where);
a->where = NULL;
@@
-140,7
+142,7
@@
static int automount_add_mount_links(Automount *a) {
assert(a);
assert(a);
- LIST_FOREACH(units_
per_type, other, a->meta.manager->units_per
_type[UNIT_MOUNT])
+ LIST_FOREACH(units_
by_type, other, a->meta.manager->units_by
_type[UNIT_MOUNT])
if ((r = automount_add_one_mount_link(a, (Mount*) other)) < 0)
return r;
if ((r = automount_add_one_mount_link(a, (Mount*) other)) < 0)
return r;
@@
-154,6
+156,9
@@
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_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
+ return r;
+
if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}
if ((r = unit_add_two_dependencies_by_name(UNIT(a), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
return r;
}
@@
-200,6
+205,7
@@
static int automount_load(Unit *u) {
return r;
if (u->meta.load_state == UNIT_LOADED) {
return r;
if (u->meta.load_state == UNIT_LOADED) {
+ Unit *x;
if (!a->where)
if (!(a->where = unit_name_to_path(u->meta.id)))
if (!a->where)
if (!(a->where = unit_name_to_path(u->meta.id)))
@@
-210,10
+216,14
@@
static int automount_load(Unit *u) {
if ((r = automount_add_mount_links(a)) < 0)
return r;
if ((r = automount_add_mount_links(a)) < 0)
return r;
- if ((r = unit_load_related_unit(u, ".mount", (Unit**) &a->mount)) < 0)
+ r = unit_load_related_unit(u, ".mount", &x);
+ if (r < 0)
return r;
return r;
- if ((r = unit_add_dependency(u, UNIT_BEFORE, UNIT(a->mount), true)) < 0)
+ unit_ref_set(&a->mount, x);
+
+ r = unit_add_two_dependencies(u, UNIT_BEFORE, UNIT_TRIGGERS, UNIT_DEREF(a->mount), true);
+ if (r < 0)
return r;
if (a->meta.default_dependencies)
return r;
if (a->meta.default_dependencies)
@@
-241,7
+251,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) {
@@
-302,7
+312,7
@@
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"
);
+
label_fix("/dev/autofs", false
);
if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) {
log_error("Failed to open /dev/autofs: %s", strerror(errno));
if ((m->dev_autofs_fd = open("/dev/autofs", O_CLOEXEC|O_RDONLY)) < 0) {
log_error("Failed to open /dev/autofs: %s", strerror(errno));
@@
-564,13
+574,14
@@
static void automount_enter_runnning(Automount *a) {
DBusError error;
assert(a);
DBusError error;
assert(a);
- assert(
a->mount
);
+ assert(
UNIT_DEREF(a->mount)
);
dbus_error_init(&error);
/* We don't take mount requests anymore if we are supposed to
* shut down anyway */
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) {
+ 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;
}
@@
-579,13
+590,13
@@
static void automount_enter_runnning(Automount *a) {
/* Before we do anything, let's see if somebody is playing games with us? */
if (lstat(a->where, &st) < 0) {
/* Before we do anything, let's see if somebody is playing games with us? */
if (lstat(a->where, &st) < 0) {
- log_warning("%s failed stat automount point: %m", a->meta.id);
+ log_warning("%s failed
to
stat automount point: %m", a->meta.id);
goto fail;
}
if (!S_ISDIR(st.st_mode) || st.st_dev != a->dev_id)
log_info("%s's automount point already active?", a->meta.id);
goto fail;
}
if (!S_ISDIR(st.st_mode) || st.st_dev != a->dev_id)
log_info("%s's automount point already active?", a->meta.id);
- else if ((r = manager_add_job(a->meta.manager, JOB_START, UNIT(a->mount), JOB_REPLACE, true, &error, NULL)) < 0) {
+ else if ((r = manager_add_job(a->meta.manager, JOB_START, UNIT
_DEREF
(a->mount), JOB_REPLACE, true, &error, NULL)) < 0) {
log_warning("%s failed to queue mount startup job: %s", a->meta.id, bus_error(&error, r));
goto fail;
}
log_warning("%s failed to queue mount startup job: %s", a->meta.id, bus_error(&error, r));
goto fail;
}
@@
-605,12
+616,12
@@
static int automount_start(Unit *u) {
assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
assert(a->state == AUTOMOUNT_DEAD || a->state == AUTOMOUNT_FAILED);
- if (path_is_mount_point(a->where)) {
+ if (path_is_mount_point(a->where
, false
)) {
log_error("Path %s is already a mount point, refusing start for %s", a->where, u->meta.id);
return -EEXIST;
}
log_error("Path %s is already a mount point, refusing start for %s", a->where, u->meta.id);
return -EEXIST;
}
- if (
a->mount
->meta.load_state != UNIT_LOADED)
+ if (
UNIT_DEREF(a->mount)
->meta.load_state != UNIT_LOADED)
return -ENOENT;
a->failure = false;
return -ENOENT;
a->failure = false;
@@
-732,10
+743,10
@@
static bool automount_check_gc(Unit *u) {
assert(a);
assert(a);
- if (!
a->mount
)
+ if (!
UNIT_DEREF(a->mount)
)
return false;
return false;
- return UNIT_VTABLE(UNIT
(a->mount))->check_gc(UNIT
(a->mount));
+ return UNIT_VTABLE(UNIT
_DEREF(a->mount))->check_gc(UNIT_DEREF
(a->mount));
}
static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
}
static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
@@
-764,7
+775,7
@@
static void automount_fd_event(Unit *u, int fd, uint32_t events, Watch *w) {
if (packet.v5_packet.pid > 0) {
char *p = NULL;
if (packet.v5_packet.pid > 0) {
char *p = NULL;
- get_process_
name
(packet.v5_packet.pid, &p);
+ get_process_
comm
(packet.v5_packet.pid, &p);
log_debug("Got direct mount request for %s, triggered by %lu (%s)", packet.v5_packet.name, (unsigned long) packet.v5_packet.pid, strna(p));
free(p);
log_debug("Got direct mount request for %s, triggered by %lu (%s)", packet.v5_packet.name, (unsigned long) packet.v5_packet.pid, strna(p));
free(p);
@@
-825,6
+836,10
@@
DEFINE_STRING_TABLE_LOOKUP(automount_state, AutomountState);
const UnitVTable automount_vtable = {
.suffix = ".automount",
const UnitVTable automount_vtable = {
.suffix = ".automount",
+ .sections =
+ "Unit\0"
+ "Automount\0"
+ "Install\0",
.no_alias = true,
.no_instances = true,
.no_alias = true,
.no_instances = true,