summaryrefslogtreecommitdiff
path: root/src/grp-initprogs/systemd-tmpfiles
diff options
context:
space:
mode:
Diffstat (limited to 'src/grp-initprogs/systemd-tmpfiles')
-rw-r--r--src/grp-initprogs/systemd-tmpfiles/Makefile7
-rw-r--r--src/grp-initprogs/systemd-tmpfiles/tmpfiles.c7
2 files changed, 9 insertions, 5 deletions
diff --git a/src/grp-initprogs/systemd-tmpfiles/Makefile b/src/grp-initprogs/systemd-tmpfiles/Makefile
index de085fa334..e71280f226 100644
--- a/src/grp-initprogs/systemd-tmpfiles/Makefile
+++ b/src/grp-initprogs/systemd-tmpfiles/Makefile
@@ -27,8 +27,13 @@ ifneq ($(ENABLE_TMPFILES),)
systemd_tmpfiles_SOURCES = \
src/tmpfiles/tmpfiles.c
+systemd_tmpfiles_CFLAGS = \
+ $(AM_CFLAGS) \
+ $(ACL_CFLAGS)
+
systemd_tmpfiles_LDADD = \
- libshared.la
+ libsystemd-shared.la \
+ $(ACL_LIBS)
rootbin_PROGRAMS += \
systemd-tmpfiles
diff --git a/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c b/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c
index f865b9cc3e..73f578572f 100644
--- a/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c
+++ b/src/grp-initprogs/systemd-tmpfiles/tmpfiles.c
@@ -867,7 +867,7 @@ static int parse_attribute_from_arg(Item *item) {
{ 'a', FS_APPEND_FL }, /* writes to file may only append */
{ 'c', FS_COMPR_FL }, /* Compress file */
{ 'd', FS_NODUMP_FL }, /* do not dump file */
- { 'e', FS_EXTENT_FL }, /* Top of directory hierarchies*/
+ { 'e', FS_EXTENT_FL }, /* Extents */
{ 'i', FS_IMMUTABLE_FL }, /* Immutable file */
{ 'j', FS_JOURNAL_DATA_FL }, /* Reserved for ext3 */
{ 's', FS_SECRM_FL }, /* Secure deletion */
@@ -1576,13 +1576,12 @@ static int clean_item_instance(Item *i, const char* instance) {
d = opendir_nomod(instance);
if (!d) {
- if (errno == ENOENT || errno == ENOTDIR) {
+ if (IN_SET(errno, ENOENT, ENOTDIR)) {
log_debug_errno(errno, "Directory \"%s\": %m", instance);
return 0;
}
- log_error_errno(errno, "Failed to open directory %s: %m", instance);
- return -errno;
+ return log_error_errno(errno, "Failed to open directory %s: %m", instance);
}
if (fstat(dirfd(d), &s) < 0)