picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

shared: be friendly to EROFS images

Browse source 
There are environments where /lib might not be necessary (think:
statically compiled portable service binary), hence don't insist on it
if the image is read-only.
This commit is contained in:
Lennart Poettering 2019-04-03 16:55:01 +02:00
parent 65290fbf3f
commit 8258578fb1
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/shared/base-filesystem.c
View file

@ -84,9 +84,15 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
if (!target)
continue;
r = symlinkat(target, fd, table[i].dir);
if (r < 0 && errno != EEXIST)
return log_error_errno(errno, "Failed to create symlink at %s/%s: %m", root, table[i].dir);
if (symlinkat(target, fd, table[i].dir) < 0) {
log_full_errno(IN_SET(errno, EEXIST, EROFS) || table[i].ignore_failure ? LOG_DEBUG : LOG_ERR, errno,
"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 (fchownat(fd, table[i].dir, uid, gid, AT_SYMLINK_NOFOLLOW) < 0)
@ -98,14 +104,14 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) {
RUN_WITH_UMASK(0000)
r = mkdirat(fd, table[i].dir, table[i].mode);
if (r < 0 && errno != EEXIST) {
log_full_errno(table[i].ignore_failure ? LOG_DEBUG : LOG_ERR, errno,
if (r < 0) {
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);
if (!table[i].ignore_failure)
return -errno;
if (IN_SET(errno, EEXIST, EROFS) || table[i].ignore_failure)
continue;
continue;
return -errno;
}
if (uid != UID_INVALID || gid != UID_INVALID) {