pool/systemd
SHA256
2
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- systemd.spec: don't call %systemd_{pre,post} on units shipped by the main

Browse Source 
package since they don't have any effect during installation (systemctl is not
  yet installed when %pre script is executed). This is actually the reason why
  it's handled by the %%posttrans scripts of systemd-presets-common-SUSE.

OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1376
This commit is contained in:
Franck Bui 2023-04-27 16:27:42 +00:00 committed by Git OBS Bridge
parent 77c0aa7ebc
commit 958f5e240c
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
systemd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Apr 27 16:15:57 UTC 2023 - Franck Bui <fbui@suse.com>
- systemd.spec: don't call %systemd_{pre,post} on units shipped by the main
package since they don't have any effect during installation (systemctl is not
yet installed when %pre script is executed). This is actually the reason why
it's handled by the %%posttrans scripts of systemd-presets-common-SUSE.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Apr 27 07:58:58 UTC 2023 - Franck Bui <fbui@suse.com> Thu Apr 27 07:58:58 UTC 2023 - Franck Bui <fbui@suse.com>

19
systemd.spec
View File

@ -964,13 +964,13 @@ tar -cO \
# Don't drop %%pre section even if it becomes empty: the build process of # Don't drop %%pre section even if it becomes empty: the build process of
# installation images uses a hardcoded list of packages with a %%pre that needs # installation images uses a hardcoded list of packages with a %%pre that needs
# to be run during the build and complains if it can't find one. # to be run during the build and complains if it can't find one.
#
# Note: presets for units shipped by the main package are applied by %%posttrans
# scripts of systemd-presets-common-SUSE. Hence we don't need to bother running
# %%systemd_{pre,post} on them, which is fortunate since the helper script the
# systemd rpm macros rely on is not yet installed.
%pre %pre
# Units listed below can be enabled at installation according to their preset :
# setting.
%systemd_pre remote-fs.target
%systemd_pre getty@.service
%systemd_pre systemd-timesyncd.service
%systemd_pre systemd-journald-audit.socket
%post %post
# Make /etc/machine-id an empty file during package installation. On the first # Make /etc/machine-id an empty file during package installation. On the first
@ -1025,13 +1025,6 @@ fi
%journal_catalog_update %journal_catalog_update
%tmpfiles_create %tmpfiles_create
# Units listed below can be enabled at installation accoding to their preset
# setting.
%systemd_post remote-fs.target
%systemd_post getty@.service
%systemd_post systemd-timesyncd.service
%systemd_post systemd-journald-audit.socket
# v228 wrongly set world writable suid root permissions on timestamp files used # v228 wrongly set world writable suid root permissions on timestamp files used
# by permanent timers. Fix the timestamps that might have been created by the # by permanent timers. Fix the timestamps that might have been created by the
# affected versions of systemd (bsc#1020601). # affected versions of systemd (bsc#1020601).