picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

core: move apply working directory code into its own apply_working_directory()

Browse source
This commit is contained in:
Djalal Harouni 2016-10-27 09:21:44 +02:00
parent 93c6bb51b6
commit e7f1e7c6e2
1 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

52
src/core/execute.c
View file

@ -2056,6 +2056,33 @@ static int apply_mount_namespace(Unit *u, const ExecContext *context,
return r; return r;
} }
static int apply_working_directory(const ExecContext *context,
const ExecParameters *params,
const char *working_directory,
const bool needs_mount_ns) {
if (params->flags & EXEC_APPLY_CHROOT) {
if (!needs_mount_ns && context->root_directory)
if (chroot(context->root_directory) < 0)
return -errno;
if (chdir(working_directory) < 0 &&
!context->working_directory_missing_ok)
return -errno;
} else {
const char *d;
d = strjoina(strempty(context->root_directory), "/",
strempty(working_directory));
if (chdir(d) < 0 &&
!context->working_directory_missing_ok)
return -errno;
}
return 0;
}
static void append_socket_pair(int *array, unsigned *n, int pair[2]) { static void append_socket_pair(int *array, unsigned *n, int pair[2]) {
assert(array); assert(array);
assert(n); assert(n);
@ -2542,27 +2569,10 @@ static int exec_child(
} }
} }
if (params->flags & EXEC_APPLY_CHROOT) { r = apply_working_directory(context, params, wd, needs_mount_namespace);
if (!needs_mount_namespace && context->root_directory) if (r < 0) {
if (chroot(context->root_directory) < 0) { *exit_status = EXIT_CHROOT;
*exit_status = EXIT_CHROOT; return r;
return -errno;
}
if (chdir(wd) < 0 &&
!context->working_directory_missing_ok) {
*exit_status = EXIT_CHDIR;
return -errno;
}
} else {
const char *d;
d = strjoina(strempty(context->root_directory), "/", strempty(wd));
if (chdir(d) < 0 &&
!context->working_directory_missing_ok) {
*exit_status = EXIT_CHDIR;
return -errno;
}
} }
#ifdef HAVE_SELINUX #ifdef HAVE_SELINUX