diff options
author | Lukas Nykryn <lnykryn@redhat.com> | 2014-01-09 18:00:50 +0100 |
---|---|---|
committer | Lukas Nykryn <lnykryn@redhat.com> | 2014-01-09 18:00:50 +0100 |
commit | f58ceb21e9cdc4b79586283743351750ae35c175 (patch) | |
tree | 0a290c4d803e5d991dbfb116b70cb2a1ff7d3860 /src | |
parent | 277f2f75f69bbd5868c74991011c804ce00dfed9 (diff) |
tmpfiles: don't allow label_fix to print ENOENT when we want to ignore it
Diffstat (limited to 'src')
-rw-r--r-- | src/tmpfiles/tmpfiles.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c index dde7d33f9e..bff95271f5 100644 --- 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) { |