Commit Graph

99 Commits

Author SHA256 Message Date
Franck Bui
8cd9f77cbf - 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
2023-06-16 13:11:13 +00:00
Franck Bui
25a2295a3a - Bump to version 22
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=95
2023-05-15 09:21:44 +00:00
Franck Bui
db8376beab fix %tmpfiles_create_package and drop 'fi' leftover
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=94
2023-05-15 09:21:10 +00:00
Franck Bui
ba6e5f27b2 avoid macros with empty bodies
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=93
2023-05-11 09:29:22 +00:00
Franck Bui
9fee5b69d2 adjust the 2 last entries of the changlog
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=92
2023-05-10 16:28:52 +00:00
Franck Bui
c32fb55b29 - Make sure that (futur) users of %sysctl_apply() and %binfmt_apply() will call
the macros with arguments.
- 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.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=91
2023-05-10 12:40:05 +00:00
Franck Bui
2aa56d936f update previous changelog entry
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=90
2023-05-10 10:00:07 +00:00
Franck Bui
1ac61c191a - Test the presence of /run/systemd/system to check whether we're operating
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 as there's no (interesting)
  user of these macros for now.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=89
2023-05-10 09:30:02 +00:00
Franck Bui
d7c94ee34f - Bump to version 21
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=88
2023-05-09 14:09:59 +00:00
Franck Bui
a97f9f97e5 - Rely on 'systemd-update-helper' shell script to implement %service_* macros
The helper was introduced by upstream commit 6d825ab2d42d3219e49a1. The main
  advantage is that we no more need to rebuild all packages to update the macro
  definitions.
  Internally the script relies on file triggers for 'daemon-reload' operations
  and for restarting units (when needed).
- Update other macros to reflect the fact that systemd package provides file
  triggers for sysusers, tmpfiles, hwdb, and journal catalog.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=87
2023-05-09 14:09:13 +00:00
Franck Bui
bd396a705f - Bump to version 20
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=86
2023-03-29 11:38:28 +00:00
Franck Bui
3b2c7f4694 - %service_del_postun: make sure to restart services if /etc/sysconfig/service
is not present.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=85
2023-03-29 11:35:52 +00:00
Franck Bui
3d2aa53763 - Drop support for -n/-f options in %service_del_postun
These options have been deprecated since a long time and the last package
  relying on them (drkonqi5) in the Factory repository has been updated.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=84
2023-03-29 10:42:15 +00:00
Franck Bui
a8a48f191f - Bump to version 19
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=83
2023-01-26 14:12:56 +00:00
Franck Bui
ef8c808e84 - udevadm hwdb is deprecated, use systemd-hwdb instead.
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=82
2023-01-26 14:11:52 +00:00
Franck Bui
c89bcb87a5 - Bump to version 18
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=81
2022-11-23 17:14:27 +00:00
Franck Bui
ccdb965aa5 Accepting request 1037656 from home:dancermak:branches:Base:System
Add %_user_tmpfilesdir macro

OBS-URL: https://build.opensuse.org/request/show/1037656
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=80
2022-11-23 17:12:56 +00:00
Franck Bui
756bd2c050 - Bump to version 17
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=79
2022-10-03 13:08:03 +00:00
Franck Bui
4680d9ecb7 - Fix syntax error in %tmpfiles_create_package() (bsc#1203945)
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=78
2022-10-03 13:00:50 +00:00
Franck Bui
5b629403ed - Bump to version 16
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=77
2022-02-17 18:53:38 +00:00
Franck Bui
8609970ea8 - Drop enablement symlink migration support of SysV init scripts
This was announced here:
  https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/3ERUP5ZZJ6PPA36L3HVN46BH6U6JL74O/

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=76
2022-02-17 18:53:00 +00:00
Franck Bui
ccdcf965ab - Bump to version 15
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=75
2022-01-19 08:27:38 +00:00
Franck Bui
ccdbdfce8d - %sysusers_create_inline was wrongly marked as deprecated
- %sysusers_create can be useful in certain cases and won't go away until we'll
  move to file triggers. So don't mark it as deprecated too

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=74
2022-01-18 21:06:57 +00:00
Franck Bui
6f9fe0af97 - Bump version to 14
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=73
2021-11-17 12:31:01 +00:00
Franck Bui
bbea6a0733 - Introduce %_systemd_util_dir
It's a backport of upstream commit 3bc66bfa0136e370a8f7b06c3b69a52f5636ef82.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=72
2021-11-17 12:27:43 +00:00
Franck Bui
818d21e58d Accepting request 922165 from home:dimstar:Factory
- Use %{load:} instead of %{?load:}: fix build with RPM 4.17.

OBS-URL: https://build.opensuse.org/request/show/922165
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=71
2021-09-29 13:21:24 +00:00
Franck Bui
4a8a20b75d - Bump to version 13
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=70
2021-06-30 09:59:52 +00:00
Franck Bui
ad43e5ad9f - Make use of "Suggests:" in %systemd_ordering
Until libzypp supports "OrderWithRequires:", we need to specify a
  similar ordering constraint that can be understood by the dep solver
  as well. Hence the use of "Suggests:" in %systemd_ordering
  (workaround for bsc#1187332).

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=69
2021-06-30 09:59:17 +00:00
Franck Bui
bbc4a5b794 - Bump to version 12
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=68
2021-05-20 10:18:45 +00:00
Franck Bui
37d00203df - Introduce %sysusers_create_package
%sysusers_create and %sysusers_create_inline are now deprecated and
  the new macro should be used instead.
  Upstream commit 07a7d4a0040d221ff09e527e91c112b4ffab1dba.
- Introduce %tmpfiles_create_package
  %%tmpfiles_create is now deprecreated and the new macros should be
  used instead.
  Upstream commit 0f78fee8d039000b987848a558fbaa15d916e14e.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=67
2021-05-20 10:17:34 +00:00
Franck Bui
f0c8ea9afc - %sysusers_create_inline: use here-docs instead of echo (bsc#1186282)
Upstream commit dd2490ae12ad1e1795ecbf8f8944b950da9c8d06.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=66
2021-05-20 09:47:35 +00:00
Franck Bui
6fc47e8204 - Bump to version 11
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=65
2021-03-05 15:09:00 +00:00
Franck Bui
4463ee13e3 Accepting request 876976 from home:alarrosa:branches:Base:System
- Don't pass -f to rm in %service_add_post nor %systemd_user_post

OBS-URL: https://build.opensuse.org/request/show/876976
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=64
2021-03-05 11:19:59 +00:00
Franck Bui
a079230c8d Accepting request 876971 from home:alarrosa:branches:Base:System
- Add a %systemd_user_pre macro that creates a
  /run/systemd/rpm/needs-user-preset/$service file for each new
  service being installed so %systemd_user_post can call
  `systemctl --global preset $service` properly for newly
  installed user services (boo#1183051, boo#1183012).

OBS-URL: https://build.opensuse.org/request/show/876971
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=63
2021-03-05 11:09:08 +00:00
Franck Bui
9f0979dfb3 Accepting request 876963 from home:alarrosa:branches:Base:System
- Fix %systemd_user_post. The --global parameter was handled as if
  it was another service name so %systemd_user_post wasn't working
  properly. Replace %systemd_user_post with the code from
  %service_add_post it was being expanded to but correctly passing
  --global to systemctl (boo#1183051, boo#1182661).

OBS-URL: https://build.opensuse.org/request/show/876963
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=62
2021-03-05 10:58:52 +00:00
Franck Bui
b9ed9090dc - Bump version to 10
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=61
2021-02-12 11:46:53 +00:00
Franck Bui
a4d73fe809 - Make upstream %systemd_{pre,post,preun,postun} aliases to their SUSE
counterparts
  Packagers can now choose to use the upstream or the SUSE variants
  indifferently. For consistency the SUSE variants should be preferred
  since almost all SUSE packages already use them but the upstream
  versions might be usefull in certain cases where packages need to
  support multiple distros based on RPM.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=60
2021-02-12 11:45:54 +00:00
Franck Bui
988d319a8f - Improve the logic used to apply the presets (bsc#1177039)
Before presests were applied at a) package installation b) new units
  introduced via a package update (but after making sure that it was
  not a SysV initscript being converted).
  The problem is that a) didn't handle package a renaming or split
  properly since the package with the new name is installed rather
  being updated and therefore the presets were applied even if they
  were already with the old name.
  We now cover this case (and the other ones) by applying presets only
  if the units are new and the services are not being migrated. This
  regardless of whether this happens during an install or an update.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=59
2021-02-12 11:01:43 +00:00
Franck Bui
e45618db9a update comment in changelogs to reflect that systemctl preset does a daemon-reload
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=58
2020-11-24 11:02:18 +00:00
Franck Bui
e531b48b7a - Bump version to 9
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=57
2020-11-23 20:33:49 +00:00
Franck Bui
f90fb4cf4f - daemon-reload is not needed in %service_add_post
Applying presets, ie enabling/disabling units, doesn't require to
  update units loaded in PID1 memory. It's actually needed after but
  it's done only once by %service_del_postun.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=56
2020-11-23 20:19:37 +00:00
Franck Bui
f65be0ea90 - Rename the tag file used to detect when presets need to be applied
Rather than placing these tags directly under /run, let's place them
  under /run/systemd/rpm. This also has the benefit to make the
  workaround for bsc#1059627 no more needed.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=55
2020-11-23 18:03:40 +00:00
Franck Bui
991b3b62db - %service_del_preun doesn't accept -f/-n options anymore
The few package calling %service_del_preun with '-f' or '-n' option
  have been fixed. These options are not needed anymore.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=54
2020-11-23 17:29:55 +00:00
Franck Bui
221719424c - Bump version to 8
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=53
2020-11-10 11:22:09 +00:00
Franck Bui
163b073fa1 - Introduce %service_del_postun_with_restart()
It's the counterpart of %service_del_postun_without_restart() and
  replaces the '-f' option of %service_del_postun().
- Expand %service_del_postun_without_restart in %service_del_postun

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=52
2020-11-10 11:04:59 +00:00
Franck Bui
198ba4caa7 - Add a missing space in %_restart_on_update()
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=51
2020-11-10 09:13:24 +00:00
Franck Bui
e3e0721640 - Bump version to 7
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=50
2020-11-09 11:40:24 +00:00
Franck Bui
4097fa89ce - Dont apply presets when migrating from a disabled initscript (bsc#1178481)
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=49
2020-11-09 11:38:05 +00:00
Franck Bui
179aa8a211 Fix typo
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=48
2020-11-09 09:26:07 +00:00
Franck Bui
aba6870f75 - Bump version to 6
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=47
2020-11-09 08:48:05 +00:00