From 8cd9f77cbf4c188ac7a6915f8a9da17fba840f366aef18b4a631ca6a0c27dea6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 16 Jun 2023 13:11:13 +0000 Subject: [PATCH] - Restore the check that prevents systemd-tmpfiles to run during transactional updates The check has been mistakenly dropped during the switch to file-triggers. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=96 --- macros.systemd | 4 ++-- systemd-rpm-macros.changes | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/macros.systemd b/macros.systemd index 7a8691d..cac47b4 100644 --- a/macros.systemd +++ b/macros.systemd @@ -226,7 +226,7 @@ fi \ %tmpfiles_create() \ %{expand:%%{?__systemd_someargs_%#:%%__systemd_someargs_%# tmpfiles_create}} \ -[ -d /run/systemd/system ] && [ -x /usr/bin/systemd-tmpfiles ] && \ +[ -z "${TRANSACTIONAL_UPDATE}" ] && [ -x /usr/bin/systemd-tmpfiles ] && \ /usr/bin/systemd-tmpfiles --create %{?*} || : \ %{nil} @@ -273,7 +273,7 @@ SYSTEMD_INLINE_EOF\ # %sysusers_create_package() \ %{expand:%%{?!__systemd_twoargs_%#:%%{error:The %%%%sysusers_create_package macro requires two arguments}}} \ -[ -x /usr/bin/systemd-sysusers ] && \ +[ -z "${TRANSACTIONAL_UPDATE}" ] && [ -x /usr/bin/systemd-tmpfiles ] && \ /usr/bin/systemd-sysusers --replace=%_sysusersdir/%1.conf - < + +- Restore the check that prevents systemd-tmpfiles to run during transactional updates + + The check has been mistakenly dropped during the switch to file-triggers. + ------------------------------------------------------------------- Mon May 15 09:21:26 UTC 2023 - Franck Bui