diff options
author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-01-19 17:09:53 +0100 |
---|---|---|
committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-01-19 17:09:53 +0100 |
commit | c59a0c4143cd285c7c513e124baed517002750bc (patch) | |
tree | d89e0afd8c6ed11925bba7ba183e0553473656fd /abrt.spec | |
parent | 3b4dbe6345b43411a3206ef728d5810b2197511d (diff) | |
download | abrt-c59a0c4143cd285c7c513e124baed517002750bc.tar.gz abrt-c59a0c4143cd285c7c513e124baed517002750bc.tar.xz abrt-c59a0c4143cd285c7c513e124baed517002750bc.zip |
abrt: init script fixes: better description
Also, replaced un-grep-able ${name}d with abrtd in .spec
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'abrt.spec')
-rw-r--r-- | abrt.spec | 22 |
1 files changed, 9 insertions, 13 deletions
@@ -250,8 +250,6 @@ make install DESTDIR=$RPM_BUILD_ROOT mandir=%{_mandir} find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f mkdir -p ${RPM_BUILD_ROOT}/%{_initrddir} install -m 755 %SOURCE1 ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd -# /var/cache/abrt is to be removed in 1.3.x timeframe -mkdir -p $RPM_BUILD_ROOT/var/cache/abrt mkdir -p $RPM_BUILD_ROOT/var/cache/abrt-di mkdir -p $RPM_BUILD_ROOT/var/run/abrt mkdir -p $RPM_BUILD_ROOT/var/spool/abrt @@ -277,26 +275,26 @@ exit 0 %post if [ $1 -eq 1 ]; then -/sbin/chkconfig --add %{name}d +/sbin/chkconfig --add abrtd fi #systemd %if %{?with_systemd} #if [ $1 -eq 1 ]; then # Enable (but don't start) the units by default - /bin/systemctl enable %{name}d.service >/dev/null 2>&1 || : + /bin/systemctl enable abrtd.service >/dev/null 2>&1 || : #fi %endif %preun if [ "$1" -eq "0" ] ; then - service %{name}d stop >/dev/null 2>&1 - /sbin/chkconfig --del %{name}d + service abrtd stop >/dev/null 2>&1 + /sbin/chkconfig --del abrtd fi #systemd %if %{?with_systemd} if [ "$1" -eq "0" ] ; then - /bin/systemctl stop %{name}d.service >/dev/null 2>&1 || : - /bin/systemctl disable %{name}d.service >/dev/null 2>&1 || : + /bin/systemctl stop abrtd.service >/dev/null 2>&1 || : + /bin/systemctl disable abrtd.service >/dev/null 2>&1 || : fi %endif @@ -328,12 +326,12 @@ fi %posttrans if [ "$1" -eq "0" ]; then - service %{name}d condrestart >/dev/null 2>&1 || : + service abrtd condrestart >/dev/null 2>&1 || : fi #systemd %if %{?with_systemd} if [ "$1" -eq "0" ]; then - /bin/systemctl try-restart %{name}d.service >/dev/null 2>&1 || : + /bin/systemctl try-restart abrtd.service >/dev/null 2>&1 || : fi %endif @@ -354,9 +352,7 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/abrt_event.conf %config(noreplace) %{_sysconfdir}/%{name}/gpg_keys %config(noreplace) %{_sysconfdir}/dbus-1/system.d/dbus-abrt.conf -%{_initrddir}/%{name}d -# /var/cache/abrt is to be removed in 1.3.x timeframe -%dir %attr(0755, abrt, abrt) %{_localstatedir}/cache/%{name} +%{_initrddir}/abrtd %dir %attr(0755, abrt, abrt) %{_localstatedir}/spool/%{name} %dir %attr(0700, abrt, abrt) %{_localstatedir}/spool/%{name}-upload %dir /var/run/%{name} |