From 12b657a1d1993aa03813c82c7793ac3a8120e1dc Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 31 Dec 2021 00:11:01 +0900 Subject: [PATCH] sysusers: use filename if /proc is not mounted During system install, /proc may not be mounted yet. Fixes RHBZ#2036217 (https://bugzilla.redhat.com/show_bug.cgi?id=2036217). (cherry picked from commit b78d7f246899687a1697cdcebe93d8512c5e7c4b) (cherry picked from commit 747b4f1ff8aac3a1b800b0a7ac0edef4af34da70) (cherry picked from commit f78a48840205339157b186b7c8e576a3c690f6d9) --- src/sysusers/sysusers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c index e77706d5ae..779d1fe56f 100644 --- a/src/sysusers/sysusers.c +++ b/src/sysusers/sysusers.c @@ -264,7 +264,7 @@ static int make_backup(const char *target, const char *x) { /* Copy over the access mask. Don't fail on chmod() or chown(). If it stays owned by us and/or * unreadable by others, then it isn't too bad... */ - r = fchmod_and_chown(fileno(dst), st.st_mode & 07777, st.st_uid, st.st_gid); + r = fchmod_and_chown_with_fallback(fileno(dst), dst_tmp, st.st_mode & 07777, st.st_uid, st.st_gid); if (r < 0) log_warning_errno(r, "Failed to change access mode or ownership of %s: %m", backup); -- 2.25.1