testing/systemd-rpm-macros
SHA256
6
0
Fork 0
forked from pool/systemd-rpm-macros
Code Pull Requests Activity
63 Commits 3 Branches 0 Tags
a4d73fe80973953e460c7b0f10309f9b5016244f221b31a83be281379bff0acc
Commit Graph

63 Commits

This Branch
This Branch
All Branches
Author SHA256 Message Date
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
Franck Bui
d3585cac9c Update one comment 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=46
 2020-11-09 08:46:43 +00:00
Franck Bui
664f945153 - Test for the presence of systemd only once in %service_add_post 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=45
 2020-11-09 08:43:46 +00:00
Franck Bui
b8ac3768b4 - No need to run 'systemd-sysv-convert --save' in %service_add_pre anymore 
Due to the fact that the initscripts being removed during package
  updates are still available in %post, systemd-sysv-convert has been
  reworked so it's only needed to call it in %post.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=44
 2020-11-09 07:45:47 +00:00
Franck Bui
fe75626308 - Make rpmbuild load our own macros.systemd to import %{%_unitdir} properly 
Ideally we should also own other %{_*dir} paths...
- Bump version to 5

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=43
 2020-11-09 07:15:43 +00:00
Franck Bui
6873a04f30 - DISABLE_RESTART_ON_UDPATE is no more read from the (build) environment 
%service_del_postun_without_restart is the interface that should be
  used by packages that need to prevent theirs services from being
  restarted.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=42
 2020-11-02 14:40:43 +00:00
Franck Bui
4dd7db0039 document the previous change 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=41
 2020-11-02 08:55:25 +00:00
Franck Bui
c6f0727a32 - Drop DISABLE_STOP_ON_REMOVAL support (jsc#SLE-8968) 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=40
 2020-10-30 17:40:53 +00:00
Franck Bui
622c3bb210 - Bump version to 4.1 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=39
 2020-09-25 09:26:01 +00:00
Franck Bui
d81d9c2469 Accepting request 829057 from home:Pharaoh_Atem:branches:Base:System 
- Sync missing macros of directory paths from upstream systemd macros
  + %_environmentdir
  + %_modulesloaddir
  + %_modprobedir

OBS-URL: https://build.opensuse.org/request/show/829057
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=38
 2020-08-25 06:25:03 +00:00
Franck Bui
8fac5fa9ed Accepting request 684198 from home:fbui:branches:Base:System 
- $1 can never be empty or it's an rpm bug

- Get rid of $FIRST_ARG
  $FIRST_ARG was probably introduced because the %service_* macros
  were playing tricks on the shell positional parameters. This is bad
  practice and error prone so let's assume that no macros should do
  that anymore and hence it's safe to assume that positional
  parameters remains unchanged after any rpm macro call.
  All users of $FIRST_ARG should have been fixed by now and in most
  cases the use of the variable was unneeded (since the macros don't
  change the shell parameters) and thus confusing.
  'net-snmp' has a different use of FIRST_ARG though as it tried to
  fake an update during a package installation. Fortunately this could
  have been fixed too.

OBS-URL: https://build.opensuse.org/request/show/684198
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=37
 2019-03-12 08:20:41 +00:00
Franck Bui
f337315c0b Accepting request 680383 from home:fbui:branches:Base:System 
- Fix %_restart_on_update_force: drop one extra trailing '}'
  Thanks Werner for spotting.

- Simplify %_restart_on_update and %_stop_on_removal
  There's no need to spawn sub shells when these macros are used.

- Macros arguments are mandatory
  Especially in %_restart_on_update_never and %_stop_on_removal_never,
  let's assume that they always receive unit names as arguments. This
  allows to make them slightly simpler (less rpm macro black magic).
  Callers will fail earlier if no arguments are passed anyway.

OBS-URL: https://build.opensuse.org/request/show/680383
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=36
 2019-03-01 09:27:15 +00:00
Franck Bui
7b2e3f4d22 - Make sure %_restart_on_update_never and %_stop_on_removal_never 
don't expand to the empty string
  Otherwise sequences like the following would result in incorrect
  shell syntax:
  if [ ]; then
     %_restart_on_update_never
  fi

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=35
 2019-02-27 14:16:36 +00:00
Franck Bui
ec2ade1bb2 - Restore one daemon-reload command 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=34
 2019-02-27 12:21:44 +00:00
Franck Bui
8685313b9b - Bump version to 4 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=33
 2019-02-25 09:56:11 +00:00
Thomas Blume
e5d6d1a3e5 Accepting request 678270 from home:fbui:branches:Base:System 
- Introduce %service_del_postun_without_restart
  This is another step to make the SUSE rpm macros closer to their
  upstream counterparts.
  Introduce %service_del_postun_without_restart which should help in
  getting rid of '-f' and '-n' switches of %service_del_postun.

OBS-URL: https://build.opensuse.org/request/show/678270
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=32
 2019-02-25 09:47:37 +00:00
Franck Bui
283ce5b854 - Drop $YAST_IS_RUNNING in favor of $SYSTEMD_OFFLINE (bsc#1117489) 
libzypp now kindly defines SYSTEMD_OFFLINE when appropriate (see
  bsc#1118758). Therefore we don't need to rely on YAST_IS_RUNNING
  anymore. It's a tiny step to make the SUSE macros closer to their
  upstream counterparts.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=31
 2019-02-21 18:00:10 +00:00
Franck Bui
7ac942a4ee - systemd-sysv-convert has been moved from /usr/sbin to /usr/lib/systemd 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=30
 2018-11-26 13:56:33 +00:00
Franck Bui
c6c149ba4c - remove confusing --user before --global 
Backport from
  28d36da64a.
  This was spotted in bsc#1090785.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=29
 2018-05-22 12:56:47 +00:00
Franck Bui
3adc1714da - Fix %systemd_post(): it's never called during package removal 
Also make it useful by restoring its original implementation.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=28
 2018-02-14 14:07:02 +00:00
Franck Bui
1f25658464 - Import more definitions from upstream (v237) 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=27
 2018-02-12 16:58:33 +00:00
Franck Bui
30f9356379 Accepting request 568124 from home:dimstar:Factory 
- Fix system_user_post macro for usage with RPM 4.14, backport from
  https://github.com/systemd/systemd/commit/e67ba783.

Addresses build issues like
https://build.opensuse.org/package/live_build_log/openSUSE:Factory/appimaged/standard/x86_64

OBS-URL: https://build.opensuse.org/request/show/568124
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=26
 2018-01-22 14:11:14 +00:00
Franck Bui
dcc8869b9f Accepting request 556888 from home:fbui:branches:Base:System 
- Move macros.systemd in /usr/lib/rpm
  The file is not supposed to be customized by the user.

- Make %systemd_add_pre() more similar to %systemd_add_post()

- Make sure to apply presets if packages start shipping units during upgrades (bsc#1071543)

OBS-URL: https://build.opensuse.org/request/show/556888
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=25
 2017-12-15 09:52:31 +00:00
Franck Bui
d1be0ff64f - Make sure to clean up "new-in-upgrade" tag file (bsc#1059627) 
The tag file might have been incorrectly left by a preceding update.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=24
 2017-12-01 10:51:04 +00:00
Franck Bui
5305ff9a1f - Restore previous changes 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=23
 2017-11-22 14:47:28 +00:00
Franck Bui
b7d0b19728 - Revert previous changes 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=22
 2017-11-17 09:25:35 +00:00
Dirk Mueller
ecab9f8fb5 Accepting request 542567 from home:kukuk:branches:Base:System 
- Don't execute systemd-tmpfiles if we run in transactional update
  mode

OBS-URL: https://build.opensuse.org/request/show/542567
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=21
 2017-11-17 09:10:26 +00:00
Franck Bui
d0cd081100 - Remove a useless test in %service_add_pre() 
The test was placed where the condition '[ "$FIRST_ARG" -gt 1 ]' was
  always true.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=20
 2017-11-02 16:12:23 +00:00
Dirk Mueller
5e363286ea Accepting request 500587 from home:dimstar:Factory 
- BuildIgnore systemd-rpm-macros: a small cycle that can be
  avoided. system-rpm-macros is being pulled in by rpm-build as
  conveniance to the packagers.

OBS-URL: https://build.opensuse.org/request/show/500587
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=19
 2017-06-06 08:26:34 +00:00
Franck Bui
729db3f61e Reference bsc#956849 to please the new OBS 'sanity' check (bsc#1041386) 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=18
 2017-06-02 09:37:54 +00:00
Franck Bui
e4ed23ee4e Accepting request 478957 from home:fbui:branches:Base:System 
- Kill preset macros

OBS-URL: https://build.opensuse.org/request/show/478957
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=17
 2017-03-14 14:17:09 +00:00
Thomas Blume
e03239fdc0 Accepting request 449714 from home:jengelh:branches:Base:System 
- RPM group fix

OBS-URL: https://build.opensuse.org/request/show/449714
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=16
 2017-01-11 16:20:27 +00:00
Marcus Meissner
349a80f2cb Accepting request 399987 from home:tsaupe:branches:Base:System:systemd-rpm-macros-bsc982343 
%service_add_post() suppress daemon-reload when in installation system

OBS-URL: https://build.opensuse.org/request/show/399987
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=15
 2016-06-07 08:03:30 +00:00
Dr. Werner Fink
35441a3b44 . 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=14
 2016-03-03 10:09:49 +00:00
Dirk Mueller
34f074503f Accepting request 362153 from home:dimstar:Factory 
- Also honor DISABLE_STOP_ON_REMOVAL and DISABLE_RESTART_ON_UPDATE
  when specified by a package directly in the .spec file. Some
  package know that a restart of their service is fatal
  (boo#968405).

OBS-URL: https://build.opensuse.org/request/show/362153
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=13
 2016-02-29 07:00:30 +00:00
Dr. Werner Fink
32642573a0 . 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=12
 2015-11-20 16:54:39 +00:00
Stephan Kulow
301f758bd3 Accepting request 332015 from home:sbrabec:branches:systemd-preset-2 
- Skip %systemd_preset_* during the clean installation to prevent
  presetting of all services (boo#946216).

OBS-URL: https://build.opensuse.org/request/show/332015
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd-rpm-macros?expand=0&rev=11
 2015-09-19 05:53:33 +00:00