rpm/systemd
SHA256
1
0
Fork 0
forked from pool/systemd
Code Pull Requests Activity

timesyncd is shipped in udev, move the related calls to %systemd_* in the udev scriptlets

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1442
This commit is contained in:
Franck Bui 2023-09-22 14:43:05 +00:00 committed by Git OBS Bridge
parent 7cfb2ae59e
commit 4553b1a7f3
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systemd.spec
View File

@ -1015,7 +1015,6 @@ if [ $1 -gt 1 ]; then
# takes care of applying the presets in its %%posttrans in this case). # takes care of applying the presets in its %%posttrans in this case).
%systemd_pre remote-fs.target %systemd_pre remote-fs.target
%systemd_pre getty@.service %systemd_pre getty@.service
%systemd_pre systemd-timesyncd.service
%systemd_pre systemd-journald-audit.socket %systemd_pre systemd-journald-audit.socket
%systemd_pre systemd-userdbd.service %systemd_pre systemd-userdbd.service
fi fi
@ -1059,7 +1058,6 @@ if [ $1 -gt 1 ]; then
# See comments for %%systemd_pre in %%pre. # See comments for %%systemd_pre in %%pre.
%systemd_post remote-fs.target %systemd_post remote-fs.target
%systemd_post getty@.service %systemd_post getty@.service
%systemd_post systemd-timesyncd.service
%systemd_post systemd-journald-audit.socket %systemd_post systemd-journald-audit.socket
%systemd_post systemd-userdbd.service %systemd_post systemd-userdbd.service
fi fi
@ -1071,7 +1069,6 @@ fi
%postun %postun
# Avoid restarting logind until fixed upstream (issue #1163) # Avoid restarting logind until fixed upstream (issue #1163)
%systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-journald.service
%systemd_postun_with_restart systemd-timesyncd.service
%systemd_postun_with_restart systemd-userdbd.service %systemd_postun_with_restart systemd-userdbd.service
%pre -n udev%{?mini} %pre -n udev%{?mini}
@ -1079,6 +1076,7 @@ fi
# setting. # setting.
%systemd_pre remote-cryptsetup.target %systemd_pre remote-cryptsetup.target
%systemd_pre systemd-pstore.service %systemd_pre systemd-pstore.service
%systemd_pre systemd-timesyncd.service
# New installations uses the last compat symlink generation number (currently at # New installations uses the last compat symlink generation number (currently at
# 2), which basically disables all compat symlinks. On old systems, the file # 2), which basically disables all compat symlinks. On old systems, the file
@ -1097,6 +1095,7 @@ fi
%endif %endif
%systemd_post remote-cryptsetup.target %systemd_post remote-cryptsetup.target
%systemd_post systemd-pstore.service %systemd_post systemd-pstore.service
%systemd_post systemd-timesyncd.service
%preun -n udev%{?mini} %preun -n udev%{?mini}
%systemd_preun systemd-udevd.service systemd-udevd-{control,kernel}.socket %systemd_preun systemd-udevd.service systemd-udevd-{control,kernel}.socket
@ -1120,6 +1119,7 @@ fi
# frame where no socket will be listening to the events sent by the kernel, no # frame where no socket will be listening to the events sent by the kernel, no
# matter if the socket unit is restarted in first or not. # matter if the socket unit is restarted in first or not.
%systemd_postun_with_restart systemd-udevd.service systemd-udevd-{control,kernel}.socket %systemd_postun_with_restart systemd-udevd.service systemd-udevd-{control,kernel}.socket
%systemd_postun_with_restart systemd-timesyncd.service
%systemd_postun systemd-pstore.service %systemd_postun systemd-pstore.service
%posttrans -n udev%{?mini} %posttrans -n udev%{?mini}