shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

Revert "repart: Make sure all files in the image are owned by root"

Browse Source 
This reverts commit d2ac7698cb.
This commit is contained in:
Daan De Meyer 2023-01-23 14:41:33 +01:00
parent 76b4d355e1
commit 49fb6e97d2
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/partition/repart.c
View File

@ -3744,12 +3744,7 @@ static int context_copy_blocks(Context *context) {
return 0;
}
static int do_copy_files(
Partition *p,
const char *root,
uid_t override_uid,
gid_t override_gid,
const Set *denylist) {
static int do_copy_files(Partition *p, const char *root, const Set *denylist) {
int r;
@ -3799,14 +3794,14 @@ static int do_copy_files(
r = copy_tree_at(
sfd, ".",
pfd, fn,
override_uid, override_gid,
getuid(), getgid(),
COPY_REFLINK|COPY_HOLES|COPY_MERGE|COPY_REPLACE|COPY_SIGINT|COPY_HARDLINKS|COPY_ALL_XATTRS|COPY_GRACEFUL_WARN,
denylist);
} else
r = copy_tree_at(
sfd, ".",
tfd, ".",
override_uid, override_gid,
getuid(), getgid(),
COPY_REFLINK|COPY_HOLES|COPY_MERGE|COPY_REPLACE|COPY_SIGINT|COPY_HARDLINKS|COPY_ALL_XATTRS|COPY_GRACEFUL_WARN,
denylist);
if (r < 0)
@ -3844,9 +3839,6 @@ static int do_copy_files(
if (r < 0)
return log_error_errno(r, "Failed to copy '%s' to '%s%s': %m", *source, strempty(arg_root), *target);
if (fchown(tfd, override_uid, override_gid) < 0)
return log_error_errno(r, "Failed to change ownership of %s", *target);
(void) copy_xattr(sfd, tfd, COPY_ALL_XATTRS);
(void) copy_access(sfd, tfd);
(void) copy_times(sfd, tfd, 0);
@ -3856,7 +3848,7 @@ static int do_copy_files(
return 0;
}
static int do_make_directories(Partition *p, uid_t override_uid, gid_t override_gid, const char *root) {
static int do_make_directories(Partition *p, const char *root) {
int r;
assert(p);
@ -3864,7 +3856,7 @@ static int do_make_directories(Partition *p, uid_t override_uid, gid_t override_
STRV_FOREACH(d, p->make_directories) {
r = mkdir_p_root(root, *d, override_uid, override_gid, 0755);
r = mkdir_p_root(root, *d, getuid(), getgid(), 0755);
if (r < 0)
return log_error_errno(r, "Failed to create directory '%s' in file system: %m", *d);
}
@ -3891,11 +3883,11 @@ static int partition_populate_directory(Partition *p, const Set *denylist, char
if (fchmod(rfd, 0755) < 0)
return log_error_errno(errno, "Failed to change mode of temporary directory: %m");
r = do_copy_files(p, root, getuid(), getgid(), denylist);
r = do_copy_files(p, root, denylist);
if (r < 0)
return r;
r = do_make_directories(p, getuid(), getgid(), root);
r = do_make_directories(p, root);
if (r < 0)
return r;
@ -3931,10 +3923,10 @@ static int partition_populate_filesystem(Partition *p, const char *node, const S
if (mount_nofollow_verbose(LOG_ERR, node, fs, p->format, MS_NOATIME|MS_NODEV|MS_NOEXEC|MS_NOSUID, NULL) < 0)
_exit(EXIT_FAILURE);
if (do_copy_files(p, fs, 0, 0, denylist) < 0)
if (do_copy_files(p, fs, denylist) < 0)
_exit(EXIT_FAILURE);
if (do_make_directories(p, 0, 0, fs) < 0)
if (do_make_directories(p, fs) < 0)
_exit(EXIT_FAILURE);
r = syncfs_path(AT_FDCWD, fs);