SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sysext: Run unmerge in a subprocess

Browse Source 
Preparation for later commit where we need a private mount namespace
for unmerge.
This commit is contained in:
Daan De Meyer
2024-10-16 14:18:24 +01:00
committed by Luca Boccassi
parent 04f0a17e92
commit 5e81ce42e7
1 changed files with 40 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/sysext/sysext.c
+40 -18
View File
@@ -354,38 +354,60 @@ static int unmerge_hierarchy(
return 0;
}
static int unmerge_subprocess(
ImageClass image_class,
char **hierarchies) {
int r, ret = 0;
STRV_FOREACH(h, hierarchies) {
_cleanup_free_ char *resolved = NULL;
r = chase(*h, arg_root, CHASE_PREFIX_ROOT, &resolved, NULL);
if (r == -ENOENT) {
log_debug_errno(r, "Hierarchy '%s%s' does not exist, ignoring.", strempty(arg_root), *h);
continue;
}
if (r < 0) {
RET_GATHER(ret, log_error_errno(r, "Failed to resolve path to hierarchy '%s%s': %m", strempty(arg_root), *h));
continue;
}
r = unmerge_hierarchy(image_class, resolved);
if (r < 0) {
RET_GATHER(ret, r);
continue;
}
}
return ret;
}
static int unmerge(
ImageClass image_class,
char **hierarchies,
bool no_reload) {
int r, ret = 0;
bool need_to_reload;
int r;
r = need_reload(image_class, hierarchies, no_reload);
if (r < 0)
return r;
need_to_reload = r > 0;
STRV_FOREACH(p, hierarchies) {
_cleanup_free_ char *resolved = NULL;
r = safe_fork("(sd-unmerge)", FORK_WAIT|FORK_DEATHSIG_SIGTERM|FORK_LOG|FORK_NEW_MOUNTNS, /* ret_pid= */ NULL);
if (r < 0)
return r;
if (r == 0) {
/* Child with its own mount namespace */
r = chase(*p, arg_root, CHASE_PREFIX_ROOT, &resolved, NULL);
if (r == -ENOENT) {
log_debug_errno(r, "Hierarchy '%s%s' does not exist, ignoring.", strempty(arg_root), *p);
continue;
}
if (r < 0) {
log_error_errno(r, "Failed to resolve path to hierarchy '%s%s': %m", strempty(arg_root), *p);
if (ret == 0)
ret = r;
r = unmerge_subprocess(image_class, hierarchies);
continue;
}
/* Our namespace ceases to exist here, also implicitly detaching all temporary mounts we
* created below /run. Nice! */
r = unmerge_hierarchy(image_class, resolved);
if (r < 0 && ret == 0)
ret = r;
_exit(r < 0 ? EXIT_FAILURE : EXIT_SUCCESS);
}
if (need_to_reload) {
@@ -394,7 +416,7 @@ static int unmerge(
return r;
}
return ret;
return 0;
}
static int verb_unmerge(int argc, char **argv, void *userdata) {