diff options
| author | Daniel Mack <zonque@gmail.com> | 2014-08-23 15:28:37 +0200 |
|---|---|---|
| committer | Daniel Mack <daniel@zonque.org> | 2014-09-05 12:18:57 +0200 |
| commit | 9fa95f8539a380e93f760956bc6982e57f5bf3af (patch) | |
| tree | f774c011d5563d2d381e91e1b50ac5c1e2e674e6 /src/core/mount.c | |
| parent | a4390b6be8869172ccdd16fef208803fc6c7a114 (diff) | |
exec: factor out most function arguments of exec_spawn() to ExecParameters
This way, the list of arguments to that function gets more comprehensive,
and we can get around passing lots of NULL and 0 arguments from socket.c,
swap.c and mount.c.
It also allows for splitting up the code in exec_spawn().
While at it, make ExecContext const in execute.c.
Diffstat (limited to 'src/core/mount.c')
| -rw-r--r-- | src/core/mount.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/core/mount.c b/src/core/mount.c index ec90b0a670..e284357c6f 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -691,6 +691,11 @@ static void mount_dump(Unit *u, FILE *f, const char *prefix) { static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) { pid_t pid; int r; + ExecParameters exec_params = { + .apply_permissions = true, + .apply_chroot = true, + .apply_tty_stdin = true, + }; assert(m); assert(c); @@ -706,21 +711,16 @@ static int mount_spawn(Mount *m, ExecCommand *c, pid_t *_pid) { if (r < 0) goto fail; + exec_params.environment = UNIT(m)->manager->environment; + exec_params.confirm_spawn = UNIT(m)->manager->confirm_spawn; + exec_params.cgroup_supported = UNIT(m)->manager->cgroup_supported; + exec_params.cgroup_path = UNIT(m)->cgroup_path; + exec_params.runtime_prefix = manager_get_runtime_prefix(UNIT(m)->manager); + exec_params.unit_id = UNIT(m)->id; + r = exec_spawn(c, - NULL, &m->exec_context, - NULL, 0, - UNIT(m)->manager->environment, - true, - true, - true, - UNIT(m)->manager->confirm_spawn, - UNIT(m)->manager->cgroup_supported, - UNIT(m)->cgroup_path, - manager_get_runtime_prefix(UNIT(m)->manager), - UNIT(m)->id, - 0, - NULL, + &exec_params, m->exec_runtime, &pid); if (r < 0) |