From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 30 Dec 2021 15:11:01 +0000 (+0900)
Subject: sysusers: use filename if /proc is not mounted
X-Git-Tag: v251-rc1~624
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b78d7f246899687a1697cdcebe93d8512c5e7c4b;p=thirdparty%2Fsystemd.git

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).
---

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 015e3a9ae40..07a65a2ebc1 100644
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -284,7 +284,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);