diff options
Diffstat (limited to 'meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch')
-rw-r--r-- | meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch index efeef07295..0a7594c068 100644 --- a/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch +++ b/meta/recipes-core/systemd/systemd/0015-don-t-pass-AT_SYMLINK_NOFOLLOW-flag-to-faccessat.patch | |||
@@ -31,13 +31,13 @@ Signed-off-by: Andre McCurdy <armccurdy@gmail.com> | |||
31 | src/shared/base-filesystem.c | 6 +++--- | 31 | src/shared/base-filesystem.c | 6 +++--- |
32 | 2 files changed, 24 insertions(+), 4 deletions(-) | 32 | 2 files changed, 24 insertions(+), 4 deletions(-) |
33 | 33 | ||
34 | diff --git a/src/basic/fs-util.h b/src/basic/fs-util.h | 34 | Index: systemd-stable/src/basic/fs-util.h |
35 | index 78d68be9fd85..c5dc84d41868 100644 | 35 | =================================================================== |
36 | --- a/src/basic/fs-util.h | 36 | --- systemd-stable.orig/src/basic/fs-util.h |
37 | +++ b/src/basic/fs-util.h | 37 | +++ systemd-stable/src/basic/fs-util.h |
38 | @@ -40,7 +40,27 @@ int fchmod_opath(int fd, mode_t m); | 38 | @@ -42,7 +42,27 @@ int fchmod_opath(int fd, mode_t m); |
39 | |||
40 | int fd_warn_permissions(const char *path, int fd); | 39 | int fd_warn_permissions(const char *path, int fd); |
40 | int stat_warn_permissions(const char *path, const struct stat *st); | ||
41 | 41 | ||
42 | -#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) | 42 | -#define laccess(path, mode) faccessat(AT_FDCWD, (path), (mode), AT_SYMLINK_NOFOLLOW) |
43 | +/* | 43 | +/* |
@@ -64,11 +64,11 @@ index 78d68be9fd85..c5dc84d41868 100644 | |||
64 | 64 | ||
65 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); | 65 | int touch_file(const char *path, bool parents, usec_t stamp, uid_t uid, gid_t gid, mode_t mode); |
66 | int touch(const char *path); | 66 | int touch(const char *path); |
67 | diff --git a/src/shared/base-filesystem.c b/src/shared/base-filesystem.c | 67 | Index: systemd-stable/src/shared/base-filesystem.c |
68 | index 657407da2d37..fbd5782d84fc 100644 | 68 | =================================================================== |
69 | --- a/src/shared/base-filesystem.c | 69 | --- systemd-stable.orig/src/shared/base-filesystem.c |
70 | +++ b/src/shared/base-filesystem.c | 70 | +++ systemd-stable/src/shared/base-filesystem.c |
71 | @@ -54,7 +54,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 71 | @@ -54,7 +54,7 @@ int base_filesystem_create(const char *r |
72 | return log_error_errno(errno, "Failed to open root file system: %m"); | 72 | return log_error_errno(errno, "Failed to open root file system: %m"); |
73 | 73 | ||
74 | for (i = 0; i < ELEMENTSOF(table); i ++) { | 74 | for (i = 0; i < ELEMENTSOF(table); i ++) { |
@@ -77,7 +77,7 @@ index 657407da2d37..fbd5782d84fc 100644 | |||
77 | continue; | 77 | continue; |
78 | 78 | ||
79 | if (table[i].target) { | 79 | if (table[i].target) { |
80 | @@ -62,7 +62,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 80 | @@ -62,7 +62,7 @@ int base_filesystem_create(const char *r |
81 | 81 | ||
82 | /* check if one of the targets exists */ | 82 | /* check if one of the targets exists */ |
83 | NULSTR_FOREACH(s, table[i].target) { | 83 | NULSTR_FOREACH(s, table[i].target) { |
@@ -86,7 +86,7 @@ index 657407da2d37..fbd5782d84fc 100644 | |||
86 | continue; | 86 | continue; |
87 | 87 | ||
88 | /* check if a specific file exists at the target path */ | 88 | /* check if a specific file exists at the target path */ |
89 | @@ -73,7 +73,7 @@ int base_filesystem_create(const char *root, uid_t uid, gid_t gid) { | 89 | @@ -73,7 +73,7 @@ int base_filesystem_create(const char *r |
90 | if (!p) | 90 | if (!p) |
91 | return log_oom(); | 91 | return log_oom(); |
92 | 92 | ||