chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: don't recheck /var availability more often than 30s
[elogind.git]
/
src
/
tmpfiles.c
diff --git
a/src/tmpfiles.c
b/src/tmpfiles.c
index 421a9154c5b0c1cdee9a21460f146ff2ddcb8390..21bf44d3a41b57897072edfccf9e313452b26a4b 100644
(file)
--- a/
src/tmpfiles.c
+++ b/
src/tmpfiles.c
@@
-157,6
+157,7
@@
static void load_unix_sockets(void) {
}
}
}
}
+ fclose(f);
return;
fail:
return;
fail:
@@
-586,7
+587,7
@@
static int remove_item(Item *i, const char *instance) {
case TRUNCATE_DIRECTORY:
case RECURSIVE_REMOVE_PATH:
case TRUNCATE_DIRECTORY:
case RECURSIVE_REMOVE_PATH:
- if ((r = rm_rf(instance, false, i->type == RECURSIVE_REMOVE_PATH)) < 0 &&
+ if ((r = rm_rf(instance, false, i->type == RECURSIVE_REMOVE_PATH
, false
)) < 0 &&
r != -ENOENT) {
log_error("rm_rf(%s): %s", instance, strerror(-r));
return r;
r != -ENOENT) {
log_error("rm_rf(%s): %s", instance, strerror(-r));
return r;