From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 7 Feb 2018 11:12:52 +0000 (+0100)
Subject: Merge pull request #8104 from keszybz/tmpfiles-allow-overrides
X-Git-Tag: v238~134
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a166e13771f308973d7b7221abd65fdd90f42c61;p=thirdparty%2Fsystemd.git

Merge pull request #8104 from keszybz/tmpfiles-allow-overrides

tmpfiles allow overrides
---

a166e13771f308973d7b7221abd65fdd90f42c61
diff --cc src/core/macros.systemd.in
index 53b13a027e7,1235a7e15af..4e27e1b06ab
--- a/src/core/macros.systemd.in
+++ b/src/core/macros.systemd.in
@@@ -84,12 -84,19 +84,13 @@@ fi 
  
  %systemd_user_postun_with_restart() %{nil}
  
 -%udev_hwdb_update() \
 -systemd-hwdb update >/dev/null 2>&1 || : \
 -%{nil}
 +%udev_hwdb_update() %{nil}
  
 -%udev_rules_update() \
 -udevadm control --reload >/dev/null 2>&1 || : \
 -%{nil}
 +%udev_rules_update() %{nil}
  
 -%journal_catalog_update() \
 -journalctl --update-catalog >/dev/null 2>&1 || : \
 -%{nil}
 +%journal_catalog_update() %{nil}
  
+ # Deprecated. Use %tmpfiles_create_package instead
  %tmpfiles_create() \
  systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \
  %{nil}