chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
log: make internal log api log directly to the journal
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index 423cf434a493791d314be0860cae6ceea36da593..f72c50afb7530d867b67d4c9d44193b13211c22c 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-68,8
+68,10
@@
static void mount_init(Unit *u) {
/* The stdio/kmsg bridge socket is on /, in order to avoid a
* dep loop, don't use kmsg logging for -.mount */
/* The stdio/kmsg bridge socket is on /, in order to avoid a
* dep loop, don't use kmsg logging for -.mount */
- if (!unit_has_name(u, "-.mount"))
- m->exec_context.std_output = EXEC_OUTPUT_KMSG;
+ if (!unit_has_name(u, "-.mount")) {
+ m->exec_context.std_output = u->meta.manager->default_std_output;
+ m->exec_context.std_error = u->meta.manager->default_std_error;
+ }
/* We need to make sure that /bin/mount is always called in
* the same process group as us, so that the autofs kernel
/* We need to make sure that /bin/mount is always called in
* the same process group as us, so that the autofs kernel
@@
-106,21
+108,12
@@
static void mount_parameters_done(MountParameters *p) {
static void mount_done(Unit *u) {
Mount *m = MOUNT(u);
static void mount_done(Unit *u) {
Mount *m = MOUNT(u);
- Meta *other;
assert(m);
free(m->where);
m->where = NULL;
assert(m);
free(m->where);
m->where = NULL;
- /* Try to detach us from the automount unit if there is any */
- LIST_FOREACH(units_per_type, other, m->meta.manager->units_per_type[UNIT_AUTOMOUNT]) {
- Automount *a = (Automount*) other;
-
- if (a->mount == m)
- a->mount = NULL;
- }
-
mount_parameters_done(&m->parameters_etc_fstab);
mount_parameters_done(&m->parameters_proc_self_mountinfo);
mount_parameters_done(&m->parameters_fragment);
mount_parameters_done(&m->parameters_etc_fstab);
mount_parameters_done(&m->parameters_proc_self_mountinfo);
mount_parameters_done(&m->parameters_fragment);
@@
-166,7
+159,7
@@
static int mount_add_mount_links(Mount *m) {
/* Adds in links to other mount points that might lie below or
* above us in the hierarchy */
/* Adds in links to other mount points that might lie below or
* above us in the hierarchy */
- LIST_FOREACH(units_
per_type, other, m->meta.manager->units_per
_type[UNIT_MOUNT]) {
+ LIST_FOREACH(units_
by_type, other, m->meta.manager->units_by
_type[UNIT_MOUNT]) {
Mount *n = (Mount*) other;
MountParameters *pn;
Mount *n = (Mount*) other;
MountParameters *pn;
@@
-223,7
+216,7
@@
static int mount_add_swap_links(Mount *m) {
assert(m);
assert(m);
- LIST_FOREACH(units_
per_type, other, m->meta.manager->units_per
_type[UNIT_SWAP])
+ LIST_FOREACH(units_
by_type, other, m->meta.manager->units_by
_type[UNIT_SWAP])
if ((r = swap_add_one_mount_link((Swap*) other, m)) < 0)
return r;
if ((r = swap_add_one_mount_link((Swap*) other, m)) < 0)
return r;
@@
-236,7
+229,7
@@
static int mount_add_path_links(Mount *m) {
assert(m);
assert(m);
- LIST_FOREACH(units_
per_type, other, m->meta.manager->units_per
_type[UNIT_PATH])
+ LIST_FOREACH(units_
by_type, other, m->meta.manager->units_by
_type[UNIT_PATH])
if ((r = path_add_one_mount_link((Path*) other, m)) < 0)
return r;
if ((r = path_add_one_mount_link((Path*) other, m)) < 0)
return r;
@@
-249,7
+242,7
@@
static int mount_add_automount_links(Mount *m) {
assert(m);
assert(m);
- LIST_FOREACH(units_
per_type, other, m->meta.manager->units_per
_type[UNIT_AUTOMOUNT])
+ LIST_FOREACH(units_
by_type, other, m->meta.manager->units_by
_type[UNIT_AUTOMOUNT])
if ((r = automount_add_one_mount_link((Automount*) other, m)) < 0)
return r;
if ((r = automount_add_one_mount_link((Automount*) other, m)) < 0)
return r;
@@
-262,7
+255,7
@@
static int mount_add_socket_links(Mount *m) {
assert(m);
assert(m);
- LIST_FOREACH(units_
per_type, other, m->meta.manager->units_per
_type[UNIT_SOCKET])
+ LIST_FOREACH(units_
by_type, other, m->meta.manager->units_by
_type[UNIT_SOCKET])
if ((r = socket_add_one_mount_link((Socket*) other, m)) < 0)
return r;
if ((r = socket_add_one_mount_link((Socket*) other, m)) < 0)
return r;
@@
-320,11
+313,14
@@
static bool needs_quota(MountParameters *p) {
return false;
return mount_test_option(p->options, "usrquota") ||
return false;
return mount_test_option(p->options, "usrquota") ||
- mount_test_option(p->options, "grpquota");
+ mount_test_option(p->options, "grpquota") ||
+ mount_test_option(p->options, "quota") ||
+ mount_test_option(p->options, "usrjquota") ||
+ mount_test_option(p->options, "grpjquota");
}
static int mount_add_fstab_links(Mount *m) {
}
static int mount_add_fstab_links(Mount *m) {
- const char *target, *after = NULL;
+ const char *target, *after = NULL
, *after2 = NULL
;
MountParameters *p;
Unit *tu;
int r;
MountParameters *p;
Unit *tu;
int r;
@@
-354,9
+350,12
@@
static int mount_add_fstab_links(Mount *m) {
if (mount_is_network(p)) {
target = SPECIAL_REMOTE_FS_TARGET;
if (mount_is_network(p)) {
target = SPECIAL_REMOTE_FS_TARGET;
- after = SPECIAL_NETWORK_TARGET;
- } else
+ after = SPECIAL_REMOTE_FS_PRE_TARGET;
+ after2 = SPECIAL_NETWORK_TARGET;
+ } else {
target = SPECIAL_LOCAL_FS_TARGET;
target = SPECIAL_LOCAL_FS_TARGET;
+ after = SPECIAL_LOCAL_FS_PRE_TARGET;
+ }
if (!path_equal(m->where, "/"))
if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
if (!path_equal(m->where, "/"))
if ((r = unit_add_two_dependencies_by_name(UNIT(m), UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_UMOUNT_TARGET, NULL, true)) < 0)
@@
-369,6
+368,10
@@
static int mount_add_fstab_links(Mount *m) {
if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
return r;
if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after, NULL, true)) < 0)
return r;
+ if (after2)
+ if ((r = unit_add_dependency_by_name(UNIT(m), UNIT_AFTER, after2, NULL, true)) < 0)
+ return r;
+
if (automount) {
Unit *am;
if (automount) {
Unit *am;
@@
-635,13
+638,18
@@
static int mount_load(Unit *u) {
static int mount_notify_automount(Mount *m, int status) {
Unit *p;
int r;
static int mount_notify_automount(Mount *m, int status) {
Unit *p;
int r;
+ Iterator i;
assert(m);
assert(m);
- if ((r = unit_get_related_unit(UNIT(m), ".automount", &p)) < 0)
- return r == -ENOENT ? 0 : r;
+ SET_FOREACH(p, m->meta.dependencies[UNIT_TRIGGERED_BY], i)
+ if (p->meta.type == UNIT_AUTOMOUNT) {
+ r = automount_send_ready(AUTOMOUNT(p), status);
+ if (r < 0)
+ return r;
+ }
- return
automount_send_ready(AUTOMOUNT(p), status)
;
+ return
0
;
}
static void mount_set_state(Mount *m, MountState state) {
}
static void mount_set_state(Mount *m, MountState state) {
@@
-791,6
+799,7
@@
static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
true,
m->meta.manager->confirm_spawn,
m->meta.cgroup_bondings,
true,
m->meta.manager->confirm_spawn,
m->meta.cgroup_bondings,
+ m->meta.cgroup_attributes,
&pid)) < 0)
goto fail;
&pid)) < 0)
goto fail;
@@
-1473,7
+1482,7
@@
static int mount_find_pri(char *options) {
char *end, *pri;
unsigned long r;
char *end, *pri;
unsigned long r;
- if (!(pri = mount_test_option(options, "pri
=
")))
+ if (!(pri = mount_test_option(options, "pri")))
return 0;
pri += 4;
return 0;
pri += 4;
@@
-1687,7
+1696,7
@@
void mount_fd_event(Manager *m, int events) {
log_error("Failed to reread /proc/self/mountinfo: %s", strerror(-r));
/* Reset flags, just in case, for later calls */
log_error("Failed to reread /proc/self/mountinfo: %s", strerror(-r));
/* Reset flags, just in case, for later calls */
- LIST_FOREACH(units_
per_type, meta, m->units_per
_type[UNIT_MOUNT]) {
+ LIST_FOREACH(units_
by_type, meta, m->units_by
_type[UNIT_MOUNT]) {
Mount *mount = (Mount*) meta;
mount->is_mounted = mount->just_mounted = mount->just_changed = false;
Mount *mount = (Mount*) meta;
mount->is_mounted = mount->just_mounted = mount->just_changed = false;
@@
-1698,7
+1707,7
@@
void mount_fd_event(Manager *m, int events) {
manager_dispatch_load_queue(m);
manager_dispatch_load_queue(m);
- LIST_FOREACH(units_
per_type, meta, m->units_per
_type[UNIT_MOUNT]) {
+ LIST_FOREACH(units_
by_type, meta, m->units_by
_type[UNIT_MOUNT]) {
Mount *mount = (Mount*) meta;
if (!mount->is_mounted) {
Mount *mount = (Mount*) meta;
if (!mount->is_mounted) {
@@
-1769,19
+1778,20
@@
static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Mount units have no main processes");
if (who == KILL_MAIN) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "Mount units have no main processes");
- return -E
INVAL
;
+ return -E
SRCH
;
}
if (m->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
}
if (m->control_pid <= 0 && who == KILL_CONTROL) {
dbus_set_error(error, BUS_ERROR_NO_SUCH_PROCESS, "No control process to kill");
- return -E
NOENT
;
+ return -E
SRCH
;
}
}
- if (m->control_pid > 0)
- if (kill(m->control_pid, signo) < 0)
- r = -errno;
+ if (who == KILL_CONTROL || who == KILL_ALL)
+ if (m->control_pid > 0)
+ if (kill(m->control_pid, signo) < 0)
+ r = -errno;
- if (mode == KILL_CONTROL_GROUP) {
+ if (
who == KILL_ALL &&
mode == KILL_CONTROL_GROUP) {
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
int q;
if (!(pid_set = set_new(trivial_hash_func, trivial_compare_func)))
@@
-1795,7
+1805,7
@@
static int mount_kill(Unit *u, KillWho who, KillMode mode, int signo, DBusError
}
if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
}
if ((q = cgroup_bonding_kill_list(m->meta.cgroup_bondings, signo, false, pid_set)) < 0)
- if (
r != -EAGAIN && r != -ESRCH && r
!= -ENOENT)
+ if (
q != -EAGAIN && q != -ESRCH && q
!= -ENOENT)
r = q;
}
r = q;
}
@@
-1834,6
+1844,10
@@
DEFINE_STRING_TABLE_LOOKUP(mount_exec_command, MountExecCommand);
const UnitVTable mount_vtable = {
.suffix = ".mount",
const UnitVTable mount_vtable = {
.suffix = ".mount",
+ .sections =
+ "Unit\0"
+ "Mount\0"
+ "Install\0",
.no_alias = true,
.no_instances = true,
.no_alias = true,
.no_instances = true,