chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
277f2f7
)
tmpfiles: don't allow label_fix to print ENOENT when we want to ignore it
author
Lukas Nykryn
<lnykryn@redhat.com>
Thu, 9 Jan 2014 17:00:50 +0000
(18:00 +0100)
committer
Lukas Nykryn
<lnykryn@redhat.com>
Thu, 9 Jan 2014 17:00:50 +0000
(18:00 +0100)
src/tmpfiles/tmpfiles.c
patch
|
blob
|
history
diff --git
a/src/tmpfiles/tmpfiles.c
b/src/tmpfiles/tmpfiles.c
index dde7d33f9ef2c2e8ae6330114d067429df8579f0..bff95271f526e5ab160c94f69834b4914a5c2e63 100644
(file)
--- a/
src/tmpfiles/tmpfiles.c
+++ b/
src/tmpfiles/tmpfiles.c
@@
-436,8
+436,6
@@
finish:
}
static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) {
- int r;
-
/* not using i->path directly because it may be a glob */
if (i->mode_set)
if (chmod(path, i->mode) < 0) {
@@
-458,8
+456,7
@@
static int item_set_perms_full(Item *i, const char *path, bool ignore_enoent) {
}
}
- r = label_fix(path, false, false);
- return r == -ENOENT && ignore_enoent ? 0 : r;
+ return label_fix(path, ignore_enoent, false);
}
static int item_set_perms(Item *i, const char *path) {