rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Let's not try to define to triggers

Browse Source 
error: line 639: Trigger fired by the same package is already defined in spec file: %post libs
It's not clear what rpm is complaining about here, but the two %triggerun's
for the same package seem to be the most likely offender.

I wanted to avoid applying to preset reset twice, alas.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2020-08-07 17:39:27 +02:00
parent c8f86d89ba
commit 84fad5038a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
systemd.spec
View File

@ -623,11 +623,10 @@ if [ $1 -eq 0 ] ; then
>/dev/null || : >/dev/null || :
fi fi
%triggerun -- systemd < 246~rc2-2 %triggerun -- systemd < 246.1-1
# This is for upgrades from previous versions before systemd-resolved became the default. # This is for upgrades from previous versions before systemd-resolved became the default.
systemctl --no-reload preset systemd-resolved.service &>/dev/null || : systemctl --no-reload preset systemd-resolved.service &>/dev/null || :
%triggerun -- systemd < 246.1-1
if systemctl is-enabled systemd-resolved.service &>/dev/null; then if systemctl is-enabled systemd-resolved.service &>/dev/null; then
grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \ grep -q 'Generated by NetworkManager' /etc/resolv.conf 2>/dev/null && \
echo -e '/etc/resolv.conf was generated by NetworkManager.\nRemoving it to let systemd-resolved manage this file.' && \ echo -e '/etc/resolv.conf was generated by NetworkManager.\nRemoving it to let systemd-resolved manage this file.' && \