diff --git a/macros.systemd b/macros.systemd index a0c3037..e3fb274 100644 --- a/macros.systemd +++ b/macros.systemd @@ -205,9 +205,13 @@ fi \ # Currently the 2 following macros don't have any interesting users. Leave them # empty until a specific need appears. -%sysctl_apply() %{nil} +%sysctl_apply() \ +%{expand:%%{?__systemd_someargs_%#:%%__systemd_someargs_%# sysctl_apply}} \ +%{nil} -%binfmt_apply() %{nil} +%binfmt_apply() \ +%{expand:%%{?__systemd_someargs_%#:%%__systemd_someargs_%# binfmt_apply}} \ +%{nil} # # Since we moved to file triggers the 2 following macros are deprecated. If the diff --git a/systemd-rpm-macros.changes b/systemd-rpm-macros.changes index 4228e12..6a5794f 100644 --- a/systemd-rpm-macros.changes +++ b/systemd-rpm-macros.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 10 12:37:05 UTC 2023 - Franck Bui + +- Make sure that (futur) users of %sysctl_apply() and %binfmt_apply() will call + the macros with arguments. + ------------------------------------------------------------------- Wed May 10 09:14:02 UTC 2023 - Franck Bui @@ -5,9 +11,11 @@ Wed May 10 09:14:02 UTC 2023 - Franck Bui during transactional updates. Hence the behavior is the same when operating in a chroot or during transactional updates. -- Leave %sysctl_apply() and %binfmt_apply() empty. Only the former has very few - users currently and none of them has specific code relying on the new sysctl - values between the macros and the file triggers. +- Leave %sysctl_apply() and %binfmt_apply() empty (bsc#1211272) + + Only the former has very few users currently and none of them has specific + code relying on the new sysctl values between the macros and the file + triggers. ------------------------------------------------------------------- Tue May 9 14:09:39 UTC 2023 - Franck Bui