shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-25 01:34:28 +03:00
Code

Merge pull request #12208 from poettering/base-file-system-tweaks

Browse Source 
base-filesystem: be nicer to read-only fs images
This commit is contained in:
Yu Watanabe 2019-04-04 13:05:12 +09:00 committed by GitHub
commit ad2d50f840
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/shared/base-filesystem.c
View File

@ -14,6 +14,7 @@
#include "log.h" #include "log.h"
#include "macro.h" #include "macro.h"
#include "nulstr-util.h" #include "nulstr-util.h"
#include "path-util.h"
#include "string-util.h" #include "string-util.h"
#include "umask-util.h" #include "umask-util.h"
#include "user-util.h" #include "user-util.h"
@ -45,8 +46,8 @@ static const BaseFilesystem table[] = {
int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
_cleanup_close_ int fd = -1; _cleanup_close_ int fd = -1;
int r = 0;
size_t i; size_t i;
int r;
fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW); fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
if (fd < 0) if (fd < 0)
@ -68,7 +69,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
if (table[i].exists) { if (table[i].exists) {
_cleanup_free_ char *p = NULL; _cleanup_free_ char *p = NULL;
p = strjoin(s, "/", table[i].exists); p = path_join(s, table[i].exists);
if (!p) if (!p)
return log_oom(); return log_oom();
@ -83,9 +84,15 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
if (!target) if (!target)
continue; continue;
r = symlinkat(target, fd, table[i].dir); if (symlinkat(target, fd, table[i].dir) < 0) {
if (r < 0 && errno != EEXIST) log_full_errno(IN_SET(errno, EEXIST, EROFS) || table[i].ignore_failure ? LOG_DEBUG : LOG_ERR, errno,
return log_error_errno(errno, "Failed to create symlink at %s/%s: %m", root, table[i].dir); "Failed to create symlink at %s/%s: %m", root, table[i].dir);
if (IN_SET(errno, EEXIST, EROFS) || table[i].ignore_failure)
continue;
return -errno;
}
if (uid_is_valid(uid) || gid_is_valid(gid)) { if (uid_is_valid(uid) || gid_is_valid(gid)) {
if (fchownat(fd, table[i].dir, uid, gid, AT_SYMLINK_NOFOLLOW) < 0) if (fchownat(fd, table[i].dir, uid, gid, AT_SYMLINK_NOFOLLOW) < 0)
@ -97,14 +104,14 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
RUN_WITH_UMASK(0000) RUN_WITH_UMASK(0000)
r = mkdirat(fd, table[i].dir, table[i].mode); r = mkdirat(fd, table[i].dir, table[i].mode);
if (r < 0 && errno != EEXIST) { if (r < 0) {
log_full_errno(table[i].ignore_failure ? LOG_DEBUG : LOG_ERR, errno, log_full_errno(IN_SET(errno, EEXIST, EROFS) || table[i].ignore_failure ? LOG_DEBUG : LOG_ERR, errno,
"Failed to create directory at %s/%s: %m", root, table[i].dir); "Failed to create directory at %s/%s: %m", root, table[i].dir);
if (!table[i].ignore_failure) if (IN_SET(errno, EEXIST, EROFS) || table[i].ignore_failure)
return -errno; continue;
continue; return -errno;
} }
if (uid != UID_INVALID || gid != UID_INVALID) { if (uid != UID_INVALID || gid != UID_INVALID) {