shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-08 11:27:32 +03:00
Code

Merge pull request #1418 from poettering/base-fs

Browse Source 
base-fs: consider inability to create /root non-fatal
This commit is contained in:
Daniel Mack 2015-09-30 16:01:42 +02:00
commit 6e83375808
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,12 +34,13 @@ typedef struct BaseFilesystem {
mode_t mode; mode_t mode;
const char *target; const char *target;
const char *exists; const char *exists;
bool ignore_failure;
} BaseFilesystem; } BaseFilesystem;
static const BaseFilesystem table[] = { static const BaseFilesystem table[] = {
{ "bin", 0, "usr/bin\0", NULL }, { "bin", 0, "usr/bin\0", NULL },
{ "lib", 0, "usr/lib\0", NULL }, { "lib", 0, "usr/lib\0", NULL },
{ "root", 0755, NULL, NULL }, { "root", 0755, NULL, NULL, true },
{ "sbin", 0, "usr/sbin\0", NULL }, { "sbin", 0, "usr/sbin\0", NULL },
{ "usr", 0755, NULL, NULL }, { "usr", 0755, NULL, NULL },
{ "var", 0755, NULL, NULL }, { "var", 0755, NULL, NULL },
@ -104,8 +105,13 @@ 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 && errno != EEXIST) {
return log_error_errno(errno, "Failed to create directory at %s/%s: %m", root, table[i].dir); log_full_errno(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 (uid != UID_INVALID || gid != UID_INVALID) { if (uid != UID_INVALID || gid != UID_INVALID) {
if (fchownat(fd, table[i].dir, uid, gid, AT_SYMLINK_NOFOLLOW) < 0) if (fchownat(fd, table[i].dir, uid, gid, AT_SYMLINK_NOFOLLOW) < 0)