chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exec: optionally apply cgroup attributes to the cgroups we create
[elogind.git]
/
src
/
automount.c
diff --git
a/src/automount.c
b/src/automount.c
index c225c161eb0fccfc3f44b74fe4339e902a3bd752..16babd1fa446399d1b839377966424072c90f345 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) {
@@
-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;
@@
-583,7
+585,7
@@
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;
}
goto fail;
}
@@
-829,6
+831,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,