Merge pull request #27053 from DaanDeMeyer/firstboot-followups

Firstboot followups
2023-03-30 04:22:16 +08:00
parent 2e34aed32b df00c5162f
commit c884484956
2 changed files with 31 additions and 14 deletions
@@ -80,8 +80,8 @@ int take_etc_passwd_lock(const char *root);
 #define UID_MAPPED_ROOT ((uid_t) (INT32_MAX-1))
 #define GID_MAPPED_ROOT ((gid_t) (INT32_MAX-1))

-#define ETC_PASSWD_LOCK_NAME ".pwd.lock"
-#define ETC_PASSWD_LOCK_PATH "/etc/" ETC_PASSWD_LOCK_NAME
+#define ETC_PASSWD_LOCK_FILENAME ".pwd.lock"
+#define ETC_PASSWD_LOCK_PATH "/etc/" ETC_PASSWD_LOCK_FILENAME

 /* The following macros add 1 when converting things, since UID 0 is a valid UID, while the pointer
 * NULL is special */