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

nspawn: use strv_extend() and friends to build directories passed to remount_idmap()

Browse Source 
No functional change, just refactoring and preparation for later change.
This commit is contained in:
Yu Watanabe
2024-09-06 13:13:15 +09:00
parent 74fe65480c
commit 21cd84df69
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nspawn/nspawn.c
+9 -9
View File
@@ -3993,22 +3993,22 @@ static int outer_child(
if (arg_userns_mode != USER_NAMESPACE_NO &&
IN_SET(arg_userns_ownership, USER_NAMESPACE_OWNERSHIP_MAP, USER_NAMESPACE_OWNERSHIP_AUTO) &&
arg_uid_shift != 0) {
_cleanup_free_ char *usr_subtree = NULL;
char *dirs[3];
size_t i = 0;
_cleanup_strv_free_ char **dirs = NULL;
dirs[i++] = (char*) directory;
r = strv_extend(&dirs, directory);
if (r < 0)
return log_oom();
if (dissected_image && dissected_image->partitions[PARTITION_USR].found) {
usr_subtree = path_join(directory, "/usr");
if (!usr_subtree)
char *s = path_join(directory, "/usr");
if (!s)
return log_oom();
dirs[i++] = usr_subtree;
r = strv_consume(&dirs, s);
if (r < 0)
return log_oom();
}
dirs[i] = NULL;
r = remount_idmap(dirs, arg_uid_shift, arg_uid_range, UID_INVALID, UID_INVALID, REMOUNT_IDMAPPING_HOST_ROOT);
if (r == -EINVAL || ERRNO_IS_NEG_NOT_SUPPORTED(r)) {
/* This might fail because the kernel or file system doesn't support idmapping. We