From 3dede0e3d99563a608ac175d92023110b2ae6a2d62f7d1404840e8fb326dde97 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 16 Jun 2023 14:42:32 +0000 Subject: [PATCH] - Make sure to skip the call to systemd-tmpfile in the file-triggers when running on transaction systems OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1395 --- systemd.changes | 6 ++++++ triggers.systemd | 4 +++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index c0c5f82e..5aa4e43c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jun 16 14:38:33 UTC 2023 - Franck Bui + +- Make sure to skip the call to systemd-tmpfile in the file-triggers when + running on transaction systems + ------------------------------------------------------------------- Thu Jun 1 15:58:24 UTC 2023 - Franck Bui diff --git a/triggers.systemd b/triggers.systemd index 1c13a31e..7792e8ac 100644 --- a/triggers.systemd +++ b/triggers.systemd @@ -102,7 +102,9 @@ end -- This script will process files installed in /usr/lib/tmpfiles.d to create -- tmpfiles automatically. The priority is set such that it will run -- after the sysusers file trigger, but before any other triggers. -assert(rpm.execute("systemd-tmpfiles", "--create")) +if os.getenv("TRANSACTIONAL_UPDATE") == nil then + assert(rpm.execute("systemd-tmpfiles", "--create")) +endf %if %{without bootstrap} %transfiletriggerin -P 1000600 -n udev -p -- /usr/lib/udev/rules.d