diff options
| author |   Kay Sievers <kay@vrfy.org> | 2014-07-01 12:12:40 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2014-07-01 12:12:40 +0200 |
| commit | 3fd165e53a90dd30af00ec0e963d8e132e3506f9 (patch) | |
| tree | f977cb4950ef88e1546d4fd6e6e7f62025d9e5e3 | |
| parent | base-filesystem: create /lib64 symlink to libdir /usr directory (diff) | |
| download | systemd-3fd165e53a90dd30af00ec0e963d8e132e3506f9.tar.gz systemd-3fd165e53a90dd30af00ec0e963d8e132e3506f9.tar.bz2 systemd-3fd165e53a90dd30af00ec0e963d8e132e3506f9.zip | |
base-filesystem: explicitely check existence of the platform's ABI dynamic loader
| -rw-r--r-- | src/shared/base-filesystem.c | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c index 682155bb4..f68386b8e 100644 --- a/src/shared/base-filesystem.c +++ b/src/shared/base-filesystem.c @@ -38,16 +38,17 @@ typedef struct BaseFilesystem { const char *dir; mode_t mode; const char *target; + const char *exists; } BaseFilesystem; static const BaseFilesystem table[] = { - { "bin", 0, "usr/bin" }, - { "lib", 0, "usr/lib" }, + { "bin", 0, "usr/bin", NULL }, + { "lib", 0, "usr/lib", NULL }, + { "root", 0755, NULL, NULL }, + { "sbin", 0, "usr/sbin", NULL }, #if defined(__i386__) || defined(__x86_64__) - { "lib64", 0, "usr/lib/x86_64-linux-gnu\0usr/lib64" }, + { "lib64", 0, "usr/lib/x86_64-linux-gnu\0usr/lib64", "ld-linux-x86-64.so.2" }, #endif - { "root", 0755, NULL }, - { "sbin", 0, "usr/sbin" }, }; int base_filesystem_create(const char *root) { @@ -69,6 +70,18 @@ int base_filesystem_create(const char *root) { 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; } |