anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone
Pablo Greco 48fc63
From 1119f95f55ee9c78d140f4d8808f85a3026380d3 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:35:56 +0100
Pablo Greco 48fc63
Subject: [PATCH] tmpfiles: "e" takes globs
Pablo Greco 48fc63
Pablo Greco 48fc63
Fixes #7369.
Pablo Greco 48fc63
Pablo Greco 48fc63
(cherry picked from commit 65241c1485dbad934e22544cd9d8724f4d7ff91d)
Pablo Greco 48fc63
Pablo Greco 48fc63
Resolves: #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 8a75efb229..f7fa2e40fa 100644
Pablo Greco 48fc63
--- a/src/tmpfiles/tmpfiles.c
Pablo Greco 48fc63
+++ b/src/tmpfiles/tmpfiles.c
Pablo Greco 48fc63
@@ -1550,12 +1550,12 @@ static int clean_item(Item *i) {
Pablo Greco 48fc63
         switch (i->type) {
Pablo Greco 48fc63
         case CREATE_DIRECTORY:
Pablo Greco 48fc63
         case CREATE_SUBVOLUME:
Pablo Greco 48fc63
-        case EMPTY_DIRECTORY:
Pablo Greco 48fc63
         case TRUNCATE_DIRECTORY:
Pablo Greco 48fc63
         case IGNORE_PATH:
Pablo Greco 48fc63
         case COPY_FILES:
Pablo Greco 48fc63
                 clean_item_instance(i, i->path);
Pablo Greco 48fc63
                 return 0;
Pablo Greco 48fc63
+        case EMPTY_DIRECTORY:
Pablo Greco 48fc63
         case IGNORE_DIRECTORY_PATH:
Pablo Greco 48fc63
                 return glob_item(i, clean_item_instance, false);
Pablo Greco 48fc63
         default: