diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-04-20 11:45:23 +0200 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-04-20 11:45:23 +0200 |
| commit | 00ddafd10e97a5a0b16bcdefd60406eb892b95a2 (patch) | |
| tree | 3da8b867804c627e0369bea7526994fb3d218d39 | |
| parent | 4582fa8273092a3125936d901ec67095a62e7e27 (diff) | |
| download | abrt-00ddafd10e97a5a0b16bcdefd60406eb892b95a2.tar.gz abrt-00ddafd10e97a5a0b16bcdefd60406eb892b95a2.tar.xz abrt-00ddafd10e97a5a0b16bcdefd60406eb892b95a2.zip | |
remove support for old lock file in abrt service script
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
| -rw-r--r-- | abrt-ccpp.init | 2 | ||||
| -rw-r--r-- | abrt.init | 10 | ||||
| -rw-r--r-- | abrt.spec | 10 |
3 files changed, 8 insertions, 14 deletions
diff --git a/abrt-ccpp.init b/abrt-ccpp.init index 07a79ae5..1676cb04 100644 --- a/abrt-ccpp.init +++ b/abrt-ccpp.init @@ -1,5 +1,5 @@ #!/bin/bash -# Install abrt coredump hook +# Install ABRT coredump hook # # chkconfig: 35 82 16 # description: Installs coredump handler which saves segfault data @@ -1,5 +1,5 @@ #!/bin/bash -# Starts the abrt daemon +# Start the ABRT daemon # # chkconfig: 35 82 16 # description: Saves segfault data, kernel oopses, fatal exceptions @@ -19,7 +19,6 @@ . /etc/rc.d/init.d/functions ABRT_BIN="/usr/sbin/abrtd" LOCK="/var/lock/subsys/abrtd" -OLD_LOCK="/var/lock/subsys/abrt" RETVAL=0 # @@ -40,7 +39,7 @@ start() { check # Check if it is already running - if [ ! -f "$LOCK" ] && [ ! -f "$OLD_LOCK" ]; then + if [ ! -f "$LOCK" ]; then echo -n $"Starting abrt daemon: " daemon "$ABRT_BIN" RETVAL=$? @@ -57,7 +56,6 @@ stop() { killproc "$ABRT_BIN" RETVAL=$? [ $RETVAL -eq 0 ] && rm -f "$LOCK" - [ $RETVAL -eq 0 ] && rm -f "$OLD_LOCK" echo return $RETVAL } @@ -92,10 +90,6 @@ condrestart) if [ -f "$LOCK" ]; then restart fi - # update from older version - if [ -f "$OLD_LOCK" ]; then - restart - fi ;; status) status abrtd @@ -314,13 +314,13 @@ exit 0 %post if [ $1 -eq 1 ]; then -/sbin/chkconfig --add abrtd + /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 abrtd.service >/dev/null 2>&1 || : + /bin/systemctl enable abrtd.service >/dev/null 2>&1 || : #fi %endif @@ -368,7 +368,7 @@ fi %if %{?with_systemd} if [ $1 -ge 1 ] ; then # On upgrade, reload init system configuration if we changed unit files - /bin/systemctl daemon-reload >/dev/null 2>&1 || : + /bin/systemctl daemon-reload >/dev/null 2>&1 || : fi %endif @@ -376,7 +376,7 @@ fi # update icon cache touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %post libs -p /sbin/ldconfig @@ -386,7 +386,7 @@ fi %postun gui touch --no-create %{_datadir}/icons/hicolor || : if [ -x %{_bindir}/gtk-update-icon-cache ]; then - %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : fi %posttrans |