pool/vsftpd
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 609848 from network

Browse Source 
Don't start/stop parameterized systemd units in pre/post actions. These units
cannot be used without an explicit parameter and attempts to do so lead to a
confusing "failed to try-restart" error message. [bsc#1093179, bsc#1010177]

OBS-URL: https://build.opensuse.org/request/show/609848
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vsftpd?expand=0&rev=66
This commit is contained in:
Dominique Leuenberger 2018-05-23 14:06:01 +00:00 committed by Git OBS Bridge
commit 0ff270757a
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vsftpd.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Wed May 16 15:25:02 UTC 2018 - psimons@suse.com
- Don't start/stop parameterized systemd units in pre/post actions.
These units cannot be used without an explicit parameter and
attempts to do so lead to a confusing "failed to try-restart"
error message. [bsc#1093179, bsc#1010177]
-------------------------------------------------------------------
Wed Apr 25 06:32:25 UTC 2018 - psimons@suse.com

8
vsftpd.spec
View File

@ -185,19 +185,19 @@ install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/s
%pre
getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure
%if %{with_systemd}
%service_add_pre %{name}.service %{name}@.service %{name}.socket
%service_add_pre %{name}.service %{name}.socket
%endif
%preun
%if %{with_systemd}
%service_del_preun %{name}.service %{name}@.service %{name}.socket
%service_del_preun %{name}.service %{name}.socket
%else
%stop_on_removal %{name}
%endif
%post
%if %{with_systemd}
%service_add_post %{name}.service %{name}@.service %{name}.socket
%service_add_post %{name}.service %{name}.socket
%else
%insserv_cleanup
%restart_on_update %{name}
@ -208,7 +208,7 @@ getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Sec
%postun
%if %{with_systemd}
%service_del_postun %{name}.service %{name}@.service %{name}.socket
%service_del_postun %{name}.service %{name}.socket
%else
%insserv_cleanup
%restart_on_update %{name}