daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
c62b8e
From 1119f95f55ee9c78d140f4d8808f85a3026380d3 Mon Sep 17 00:00:00 2001
c62b8e
From: Jan Synacek <jsynacek@redhat.com>
c62b8e
Date: Tue, 11 Dec 2018 10:35:56 +0100
c62b8e
Subject: [PATCH] tmpfiles: "e" takes globs
c62b8e
c62b8e
Fixes #7369.
c62b8e
c62b8e
(cherry picked from commit 65241c1485dbad934e22544cd9d8724f4d7ff91d)
c62b8e
c62b8e
Resolves: #1641764
c62b8e
---
c62b8e
 src/tmpfiles/tmpfiles.c | 2 +-
c62b8e
 1 file changed, 1 insertion(+), 1 deletion(-)
c62b8e
c62b8e
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
c62b8e
index 8a75efb229..f7fa2e40fa 100644
c62b8e
--- a/src/tmpfiles/tmpfiles.c
c62b8e
+++ b/src/tmpfiles/tmpfiles.c
c62b8e
@@ -1550,12 +1550,12 @@ static int clean_item(Item *i) {
c62b8e
         switch (i->type) {
c62b8e
         case CREATE_DIRECTORY:
c62b8e
         case CREATE_SUBVOLUME:
c62b8e
-        case EMPTY_DIRECTORY:
c62b8e
         case TRUNCATE_DIRECTORY:
c62b8e
         case IGNORE_PATH:
c62b8e
         case COPY_FILES:
c62b8e
                 clean_item_instance(i, i->path);
c62b8e
                 return 0;
c62b8e
+        case EMPTY_DIRECTORY:
c62b8e
         case IGNORE_DIRECTORY_PATH:
c62b8e
                 return glob_item(i, clean_item_instance, false);
c62b8e
         default: