chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
execute: if the main process of a service already owns the TTY, don't wait for acquir...
[elogind.git]
/
src
/
mount.c
diff --git
a/src/mount.c
b/src/mount.c
index 6da880eb8ff1fcf0c15f34b3d7ce0016ce95a8c9..e7fdcc84f358993a8cc0aa154bd9102d9c82ef92 100644
(file)
--- a/
src/mount.c
+++ b/
src/mount.c
@@
-253,7
+253,7
@@
static int mount_add_target_links(Mount *m) {
else
target = SPECIAL_LOCAL_FS_TARGET;
else
target = SPECIAL_LOCAL_FS_TARGET;
- if ((r = manager_load_unit(m->meta.manager, target, NULL, &tu)) < 0)
+ if ((r = manager_load_unit(m->meta.manager, target, NULL,
NULL,
&tu)) < 0)
return r;
if (automount && m->meta.manager->running_as == MANAGER_SYSTEM) {
return r;
if (automount && m->meta.manager->running_as == MANAGER_SYSTEM) {
@@
-535,6
+535,7
@@
static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) {
true,
true,
m->meta.manager->confirm_spawn,
true,
true,
m->meta.manager->confirm_spawn,
+ true,
m->meta.cgroup_bondings,
&pid)) < 0)
goto fail;
m->meta.cgroup_bondings,
&pid)) < 0)
goto fail;
@@
-1548,6
+1549,7
@@
const UnitVTable mount_vtable = {
.no_alias = true,
.no_instances = true,
.no_isolate = true,
.no_alias = true,
.no_instances = true,
.no_isolate = true,
+ .show_status = true,
.init = mount_init,
.load = mount_load,
.init = mount_init,
.load = mount_load,