chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
readahead: remove misleading error messages
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index f978a5467d2f542e76046f7292ecafa8168585b0..102d88b6e068846577f8b628613606fd837967a2 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-64,6
+64,7
@@
static void mount_init(Unit *u) {
m->directory_mode = 0755;
exec_context_init(&m->exec_context);
m->directory_mode = 0755;
exec_context_init(&m->exec_context);
+ m->exec_context.std_output = EXEC_OUTPUT_KMSG;
/* 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
@@
-98,12
+99,21
@@
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);
@@
-363,6
+373,7
@@
static int mount_add_device_links(Mount *m) {
}
if (p->passno > 0 &&
}
if (p->passno > 0 &&
+ !mount_is_bind(p) &&
UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM &&
!path_equal(m->where, "/")) {
char *name;
UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM &&
!path_equal(m->where, "/")) {
char *name;
@@
-455,6
+466,9
@@
static int mount_load(Unit *u) {
/* This is a new unit? Then let's add in some extras */
if (u->meta.load_state == UNIT_LOADED) {
/* This is a new unit? Then let's add in some extras */
if (u->meta.load_state == UNIT_LOADED) {
+ if ((r = unit_add_exec_dependencies(u, &m->exec_context)) < 0)
+ return r;
+
if (m->meta.fragment_path)
m->from_fragment = true;
if (m->meta.fragment_path)
m->from_fragment = true;