chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
strv: return NULL from strv_free()
[elogind.git]
/
src
/
shared
/
base-filesystem.c
diff --git
a/src/shared/base-filesystem.c
b/src/shared/base-filesystem.c
index 682155bb4538335b7e96be4a6d279d0bf13ec6bf..6bd317f354d40def56cf0a5349502e11eabe4623 100644
(file)
--- a/
src/shared/base-filesystem.c
+++ b/
src/shared/base-filesystem.c
@@
-22,32
+22,29
@@
#include <errno.h>
#include <sys/stat.h>
#include <stdlib.h>
#include <errno.h>
#include <sys/stat.h>
#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
#include <unistd.h>
#include "base-filesystem.h"
#include "log.h"
#include "macro.h"
#include <unistd.h>
#include "base-filesystem.h"
#include "log.h"
#include "macro.h"
-#include "strv.h"
#include "util.h"
#include "util.h"
-#include "label.h"
-#include "mkdir.h"
typedef struct BaseFilesystem {
const char *dir;
mode_t mode;
const char *target;
typedef struct BaseFilesystem {
const char *dir;
mode_t mode;
const char *target;
+ const char *exists;
} BaseFilesystem;
static const BaseFilesystem table[] = {
} BaseFilesystem;
static const BaseFilesystem table[] = {
- { "bin", 0, "usr/bin" },
- { "lib", 0, "usr/lib" },
+ { "bin", 0, "usr/bin\0", NULL },
+ { "lib", 0, "usr/lib\0", NULL },
+ { "root", 0755, NULL, NULL },
+ { "sbin", 0, "usr/sbin\0", NULL },
#if defined(__i386__) || defined(__x86_64__)
#if defined(__i386__) || defined(__x86_64__)
- { "lib64", 0, "usr/lib/x86_64-linux-gnu\0usr/lib64" },
+ { "lib64", 0, "usr/lib/x86_64-linux-gnu\0"
+ "usr/lib64\0", "ld-linux-x86-64.so.2" },
#endif
#endif
- { "root", 0755, NULL },
- { "sbin", 0, "usr/sbin" },
};
int base_filesystem_create(const char *root) {
};
int base_filesystem_create(const char *root) {
@@
-57,18
+54,32
@@
int base_filesystem_create(const char *root) {
fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
if (fd < 0)
fd = open(root, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW);
if (fd < 0)
- return
-errno
;
+ return
log_error_errno(errno, "Failed to open root file system: %m")
;
for (i = 0; i < ELEMENTSOF(table); i ++) {
for (i = 0; i < ELEMENTSOF(table); i ++) {
+ if (faccessat(fd, table[i].dir, F_OK, AT_SYMLINK_NOFOLLOW) >= 0)
+ continue;
+
if (table[i].target) {
if (table[i].target) {
- const char *target = NULL;
- const char *s;
+ const char *target = NULL, *s;
/* check if one of the targets exists */
NULSTR_FOREACH(s, table[i].target) {
if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
continue;
/* check if one of the targets exists */
NULSTR_FOREACH(s, table[i].target) {
if (faccessat(fd, s, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
continue;
+ /* check if a specific file exists at the target path */
+ if (table[i].exists) {
+ _cleanup_free_ char *p = NULL;
+
+ p = strjoin(s, "/", table[i].exists, NULL);
+ if (!p)
+ return log_oom();
+
+ if (faccessat(fd, p, F_OK, AT_SYMLINK_NOFOLLOW) < 0)
+ continue;
+ }
+
target = s;
break;
}
target = s;
break;
}
@@
-77,19
+88,15
@@
int base_filesystem_create(const char *root) {
continue;
r = symlinkat(target, fd, table[i].dir);
continue;
r = symlinkat(target, fd, table[i].dir);
- if (r < 0 && errno != EEXIST) {
- log_error("Failed to create symlink at %s/%s: %m", root, table[i].dir);
- return -errno;
- }
+ if (r < 0 && errno != EEXIST)
+ return log_error_errno(errno, "Failed to create symlink at %s/%s: %m", root, table[i].dir);
continue;
}
RUN_WITH_UMASK(0000)
r = mkdirat(fd, table[i].dir, table[i].mode);
continue;
}
RUN_WITH_UMASK(0000)
r = mkdirat(fd, table[i].dir, table[i].mode);
- if (r < 0 && errno != EEXIST) {
- log_error("Failed to create directory at %s/%s: %m", root, table[i].dir);
- return -errno;
- }
+ if (r < 0 && errno != EEXIST)
+ return log_error_errno(errno, "Failed to create directory at %s/%s: %m", root, table[i].dir);
}
return 0;
}
return 0;