anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0689-tmpfiles-e-is-supposed-to-accept-shell-style-globs.patch

Pablo Greco 48fc63
From 40ed615d2f05472e2bc807fa1cdf5498625321e7 Mon Sep 17 00:00:00 2001
Pablo Greco 48fc63
From: Jan Synacek <jsynacek@redhat.com>
Pablo Greco 48fc63
Date: Tue, 11 Dec 2018 10:40:25 +0100
Pablo Greco 48fc63
Subject: [PATCH] tmpfiles: 'e' is supposed to accept shell-style globs
Pablo Greco 48fc63
Pablo Greco 48fc63
(cherry picked from commit 939ca2136363f50b5acdb9ca102b9c27389859f1)
Pablo Greco 48fc63
Pablo Greco 48fc63
Related: #1641764
Pablo Greco 48fc63
---
Pablo Greco 48fc63
 src/tmpfiles/tmpfiles.c | 2 +-
Pablo Greco 48fc63
 1 file changed, 1 insertion(+), 1 deletion(-)
Pablo Greco 48fc63
Pablo Greco 48fc63
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
Pablo Greco 48fc63
index 20bc465d23..0b17b5908e 100644
Pablo Greco 48fc63
--- a/src/tmpfiles/tmpfiles.c
Pablo Greco 48fc63
+++ b/src/tmpfiles/tmpfiles.c
Pablo Greco 48fc63
@@ -1240,7 +1240,7 @@ static int create_item(Item *i) {
Pablo Greco 48fc63
                 /* fall through */
Pablo Greco 48fc63
 
Pablo Greco 48fc63
         case EMPTY_DIRECTORY:
Pablo Greco 48fc63
-                r = path_set_perms(i, i->path);
Pablo Greco 48fc63
+                r = glob_item(i, path_set_perms, false);
Pablo Greco 48fc63
                 if (r < 0)
Pablo Greco 48fc63
                         return r;
Pablo Greco 48fc63