External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-02-08 12:41:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

rpm: Reorder scriptlets

Browse Source 
To make things more readable, use the same order (%pre, %post,
%posttrans, %preun, %postun) everywhere.

Signed-off-by: Andrea Bolognani <abologna@redhat.com>
Reviewed-by: Martin Kletzander <mkletzan@redhat.com>
This commit is contained in:
Andrea Bolognani 2023-07-05 18:49:17 +02:00
parent 05ef4da4d7
commit 1f3065a552
1 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
libvirt.spec.in
View File

@ -1492,9 +1492,6 @@ fi \
%endif %endif
%libvirt_daemon_schedule_restart libvirtd %libvirt_daemon_schedule_restart libvirtd
%preun daemon
%libvirt_daemon_systemd_preun_inet libvirtd
%posttrans daemon %posttrans daemon
%libvirt_sysconfig_posttrans libvirtd %libvirt_sysconfig_posttrans libvirtd
if test %libvirt_daemon_needs_restart libvirtd if test %libvirt_daemon_needs_restart libvirtd
@ -1531,6 +1528,9 @@ then
fi fi
%libvirt_daemon_finish_restart libvirtd %libvirt_daemon_finish_restart libvirtd
%preun daemon
%libvirt_daemon_systemd_preun_inet libvirtd
%pre daemon-common %pre daemon-common
%libvirt_sysconfig_pre libvirt-guests %libvirt_sysconfig_pre libvirt-guests
# 'libvirt' group is just to allow password-less polkit access to libvirt # 'libvirt' group is just to allow password-less polkit access to libvirt
@ -1541,6 +1541,9 @@ exit 0
%post daemon-common %post daemon-common
%systemd_post libvirt-guests.service %systemd_post libvirt-guests.service
%posttrans daemon-common
%libvirt_sysconfig_posttrans libvirt-guests
%preun daemon-common %preun daemon-common
%systemd_preun libvirt-guests.service %systemd_preun libvirt-guests.service
@ -1548,15 +1551,15 @@ exit 0
/bin/systemctl daemon-reload >/dev/null 2>&1 || : /bin/systemctl daemon-reload >/dev/null 2>&1 || :
%systemd_postun libvirt-guests.service %systemd_postun libvirt-guests.service
%posttrans daemon-common
%libvirt_sysconfig_posttrans libvirt-guests
%pre daemon-lock %pre daemon-lock
%libvirt_sysconfig_pre virtlockd %libvirt_sysconfig_pre virtlockd
%post daemon-lock %post daemon-lock
%libvirt_daemon_systemd_post_priv virtlockd %libvirt_daemon_systemd_post_priv virtlockd
%posttrans daemon-lock
%libvirt_sysconfig_posttrans virtlockd
%preun daemon-lock %preun daemon-lock
%libvirt_daemon_systemd_preun_priv virtlockd %libvirt_daemon_systemd_preun_priv virtlockd
@ -1566,15 +1569,15 @@ if [ $1 -ge 1 ] ; then
/bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || : /bin/systemctl reload-or-try-restart virtlockd.service >/dev/null 2>&1 || :
fi fi
%posttrans daemon-lock
%libvirt_sysconfig_posttrans virtlockd
%pre daemon-log %pre daemon-log
%libvirt_sysconfig_pre virtlogd %libvirt_sysconfig_pre virtlogd
%post daemon-log %post daemon-log
%libvirt_daemon_systemd_post_priv virtlogd %libvirt_daemon_systemd_post_priv virtlogd
%posttrans daemon-log
%libvirt_sysconfig_posttrans virtlogd
%preun daemon-log %preun daemon-log
%libvirt_daemon_systemd_preun_priv virtlogd %libvirt_daemon_systemd_preun_priv virtlogd
@ -1584,9 +1587,6 @@ if [ $1 -ge 1 ] ; then
/bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || : /bin/systemctl reload-or-try-restart virtlogd.service >/dev/null 2>&1 || :
fi fi
%posttrans daemon-log
%libvirt_sysconfig_posttrans virtlogd
%pre daemon-proxy %pre daemon-proxy
%libvirt_sysconfig_pre virtproxyd %libvirt_sysconfig_pre virtproxyd
@ -1595,12 +1595,12 @@ fi
%libvirt_daemon_systemd_post_inet virtproxyd %libvirt_daemon_systemd_post_inet virtproxyd
%endif %endif
%preun daemon-proxy
%libvirt_daemon_systemd_preun_inet virtproxyd
%posttrans daemon-proxy %posttrans daemon-proxy
%libvirt_sysconfig_posttrans virtproxyd %libvirt_sysconfig_posttrans virtproxyd
%preun daemon-proxy
%libvirt_daemon_systemd_preun_inet virtproxyd
%pre daemon-driver-network %pre daemon-driver-network
%libvirt_sysconfig_pre virtnetworkd %libvirt_sysconfig_pre virtnetworkd
@ -1614,6 +1614,10 @@ fi
%endif %endif
%libvirt_daemon_schedule_restart virtnetworkd %libvirt_daemon_schedule_restart virtnetworkd
%posttrans daemon-driver-network
%libvirt_sysconfig_posttrans virtnetworkd
%libvirt_daemon_perform_restart virtnetworkd
%preun daemon-driver-network %preun daemon-driver-network
%libvirt_daemon_systemd_preun virtnetworkd %libvirt_daemon_systemd_preun virtnetworkd
@ -1622,10 +1626,6 @@ fi
%firewalld_reload %firewalld_reload
%endif %endif
%posttrans daemon-driver-network
%libvirt_sysconfig_posttrans virtnetworkd
%libvirt_daemon_perform_restart virtnetworkd
%pre daemon-driver-nwfilter %pre daemon-driver-nwfilter
%libvirt_sysconfig_pre virtnwfilterd %libvirt_sysconfig_pre virtnwfilterd
@ -1635,13 +1635,13 @@ fi
%endif %endif
%libvirt_daemon_schedule_restart virtnwfilterd %libvirt_daemon_schedule_restart virtnwfilterd
%preun daemon-driver-nwfilter
%libvirt_daemon_systemd_preun virtnwfilterd
%posttrans daemon-driver-nwfilter %posttrans daemon-driver-nwfilter
%libvirt_sysconfig_posttrans virtnwfilterd %libvirt_sysconfig_posttrans virtnwfilterd
%libvirt_daemon_perform_restart virtnwfilterd %libvirt_daemon_perform_restart virtnwfilterd
%preun daemon-driver-nwfilter
%libvirt_daemon_systemd_preun virtnwfilterd
%pre daemon-driver-nodedev %pre daemon-driver-nodedev
%libvirt_sysconfig_pre virtnodedevd %libvirt_sysconfig_pre virtnodedevd
@ -1651,13 +1651,13 @@ fi
%endif %endif
%libvirt_daemon_schedule_restart virtnodedevd %libvirt_daemon_schedule_restart virtnodedevd
%preun daemon-driver-nodedev
%libvirt_daemon_systemd_preun virtnodedevd
%posttrans daemon-driver-nodedev %posttrans daemon-driver-nodedev
%libvirt_sysconfig_posttrans virtnodedevd %libvirt_sysconfig_posttrans virtnodedevd
%libvirt_daemon_perform_restart virtnodedevd %libvirt_daemon_perform_restart virtnodedevd
%preun daemon-driver-nodedev
%libvirt_daemon_systemd_preun virtnodedevd
%pre daemon-driver-interface %pre daemon-driver-interface
%libvirt_sysconfig_pre virtinterfaced %libvirt_sysconfig_pre virtinterfaced
@ -1667,13 +1667,13 @@ fi
%endif %endif
%libvirt_daemon_schedule_restart virtinterfaced %libvirt_daemon_schedule_restart virtinterfaced
%preun daemon-driver-interface
%libvirt_daemon_systemd_preun virtinterfaced
%posttrans daemon-driver-interface %posttrans daemon-driver-interface
%libvirt_sysconfig_posttrans virtinterfaced %libvirt_sysconfig_posttrans virtinterfaced
%libvirt_daemon_perform_restart virtinterfaced %libvirt_daemon_perform_restart virtinterfaced
%preun daemon-driver-interface
%libvirt_daemon_systemd_preun virtinterfaced
%pre daemon-driver-secret %pre daemon-driver-secret
%libvirt_sysconfig_pre virtsecretd %libvirt_sysconfig_pre virtsecretd
@ -1683,13 +1683,13 @@ fi
%endif %endif
%libvirt_daemon_schedule_restart virtsecretd %libvirt_daemon_schedule_restart virtsecretd
%preun daemon-driver-secret
%libvirt_daemon_systemd_preun virtsecretd
%posttrans daemon-driver-secret %posttrans daemon-driver-secret
%libvirt_sysconfig_posttrans virtsecretd %libvirt_sysconfig_posttrans virtsecretd
%libvirt_daemon_perform_restart virtsecretd %libvirt_daemon_perform_restart virtsecretd
%preun daemon-driver-secret
%libvirt_daemon_systemd_preun virtsecretd
%pre daemon-driver-storage-core %pre daemon-driver-storage-core
%libvirt_sysconfig_pre virtstoraged %libvirt_sysconfig_pre virtstoraged
@ -1699,13 +1699,13 @@ fi
%endif %endif
%libvirt_daemon_schedule_restart virtstoraged %libvirt_daemon_schedule_restart virtstoraged
%preun daemon-driver-storage-core
%libvirt_daemon_systemd_preun virtstoraged
%posttrans daemon-driver-storage-core %posttrans daemon-driver-storage-core
%libvirt_sysconfig_posttrans virtstoraged %libvirt_sysconfig_posttrans virtstoraged
%libvirt_daemon_perform_restart virtstoraged %libvirt_daemon_perform_restart virtstoraged
%preun daemon-driver-storage-core
%libvirt_daemon_systemd_preun virtstoraged
%if %{with_qemu} %if %{with_qemu}
%pre daemon-driver-qemu %pre daemon-driver-qemu
%libvirt_sysconfig_pre virtqemud %libvirt_sysconfig_pre virtqemud
@ -1729,12 +1729,12 @@ exit 0
%endif %endif
%libvirt_daemon_schedule_restart virtqemud %libvirt_daemon_schedule_restart virtqemud
%preun daemon-driver-qemu
%libvirt_daemon_systemd_preun virtqemud
%posttrans daemon-driver-qemu %posttrans daemon-driver-qemu
%libvirt_sysconfig_posttrans virtqemud %libvirt_sysconfig_posttrans virtqemud
%libvirt_daemon_perform_restart virtqemud %libvirt_daemon_perform_restart virtqemud
%preun daemon-driver-qemu
%libvirt_daemon_systemd_preun virtqemud
%endif %endif
%if %{with_lxc} %if %{with_lxc}
@ -1747,48 +1747,48 @@ exit 0
%endif %endif
%libvirt_daemon_schedule_restart virtlxcd %libvirt_daemon_schedule_restart virtlxcd
%preun daemon-driver-lxc
%libvirt_daemon_systemd_preun virtlxcd
%posttrans daemon-driver-lxc %posttrans daemon-driver-lxc
%libvirt_sysconfig_posttrans virtlxcd %libvirt_sysconfig_posttrans virtlxcd
%libvirt_daemon_perform_restart virtlxcd %libvirt_daemon_perform_restart virtlxcd
%preun daemon-driver-lxc
%libvirt_daemon_systemd_preun virtlxcd
%endif %endif
%if %{with_vbox} %if %{with_vbox}
%pre daemon-driver-vbox
%libvirt_sysconfig_pre virtvboxd
%post daemon-driver-vbox %post daemon-driver-vbox
%if %{with_modular_daemons} %if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtvboxd %libvirt_daemon_systemd_post virtvboxd
%endif %endif
%libvirt_daemon_schedule_restart virtvboxd %libvirt_daemon_schedule_restart virtvboxd
%pre daemon-driver-vbox
%libvirt_sysconfig_pre virtvboxd
%preun daemon-driver-vbox
%libvirt_daemon_systemd_preun virtvboxd
%posttrans daemon-driver-vbox %posttrans daemon-driver-vbox
%libvirt_sysconfig_posttrans virtvboxd %libvirt_sysconfig_posttrans virtvboxd
%libvirt_daemon_perform_restart virtvboxd %libvirt_daemon_perform_restart virtvboxd
%preun daemon-driver-vbox
%libvirt_daemon_systemd_preun virtvboxd
%endif %endif
%if %{with_libxl} %if %{with_libxl}
%pre daemon-driver-libxl
%libvirt_sysconfig_pre virtxend
%post daemon-driver-libxl %post daemon-driver-libxl
%if %{with_modular_daemons} %if %{with_modular_daemons}
%libvirt_daemon_systemd_post virtxend %libvirt_daemon_systemd_post virtxend
%endif %endif
%libvirt_daemon_schedule_restart virtxend %libvirt_daemon_schedule_restart virtxend
%pre daemon-driver-libxl
%libvirt_sysconfig_pre virtxend
%preun daemon-driver-libxl
%libvirt_daemon_systemd_preun virtxend
%posttrans daemon-driver-libxl %posttrans daemon-driver-libxl
%libvirt_sysconfig_posttrans virtxend %libvirt_sysconfig_posttrans virtxend
%libvirt_daemon_perform_restart virtxend %libvirt_daemon_perform_restart virtxend
%preun daemon-driver-libxl
%libvirt_daemon_systemd_preun virtxend
%endif %endif
%post daemon-config-network %post daemon-config-network