diff --git a/vsftpd.changes b/vsftpd.changes index f284929..33b0f9f 100644 --- a/vsftpd.changes +++ b/vsftpd.changes @@ -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 diff --git a/vsftpd.spec b/vsftpd.spec index 15cc783..8f60847 100644 --- a/vsftpd.spec +++ b/vsftpd.spec @@ -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}