From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Tue, 20 Nov 2018 12:00:28 +0000 (+0100)
Subject: Merge pull request #10538 from poettering/tmpfiles-reorder
X-Git-Tag: v240~265
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=606b0b64a70abd6b6a7f5beb6b52278ee2c229a9;p=thirdparty%2Fsystemd.git

Merge pull request #10538 from poettering/tmpfiles-reorder

tmpfiles: remove children before their parents plus other fixlets
---

606b0b64a70abd6b6a7f5beb6b52278ee2c229a9
diff --cc src/tmpfiles/tmpfiles.c
index a81cecd2f9d,871beb90437..31990ff182f
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@@ -149,11 -158,9 +158,9 @@@ typedef enum DirectoryType 
  
  static bool arg_cat_config = false;
  static bool arg_user = false;
- static bool arg_create = false;
- static bool arg_clean = false;
- static bool arg_remove = false;
+ static OperationMask arg_operation = 0;
  static bool arg_boot = false;
 -static bool arg_no_pager = false;
 +static PagerFlags arg_pager_flags = 0;
  
  static char **arg_include_prefixes = NULL;
  static char **arg_exclude_prefixes = NULL;