From c1de86079ae95fe50955930a7e35d5a0542bb63a Mon Sep 17 00:00:00 2001 From: maroy Date: Fri, 22 Apr 2005 13:21:55 +0000 Subject: [PATCH] made sure livesupport-station service stop and kill commands don't stop the process, even if they fail --- livesupport/etc/debian/livesupport-station.preinst | 8 ++++---- livesupport/etc/debian/livesupport-station.prerm | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/livesupport/etc/debian/livesupport-station.preinst b/livesupport/etc/debian/livesupport-station.preinst index 895a3b571..7519415e7 100644 --- a/livesupport/etc/debian/livesupport-station.preinst +++ b/livesupport/etc/debian/livesupport-station.preinst @@ -105,11 +105,11 @@ case "$1" in if [ "$1" = "upgrade" ]; then if command -v invoke-rc.d >/dev/null 2>&1 ; then - invoke-rc.d livesupport-station stop - invoke-rc.d livesupport-station kill + invoke-rc.d livesupport-station stop || true + invoke-rc.d livesupport-station kill || true else - /etc/init.d/livesupport-station stop - /etc/init.d/livesupport-station kill + /etc/init.d/livesupport-station stop || true + /etc/init.d/livesupport-station kill || true fi fi ;; diff --git a/livesupport/etc/debian/livesupport-station.prerm b/livesupport/etc/debian/livesupport-station.prerm index 23e75ec7a..83b0d9131 100644 --- a/livesupport/etc/debian/livesupport-station.prerm +++ b/livesupport/etc/debian/livesupport-station.prerm @@ -21,11 +21,11 @@ case "$1" in remove|upgrade|deconfigure) # stop and remove the livesupport scheduler daemon if command -v invoke-rc.d >/dev/null 2>&1 ; then - invoke-rc.d livesupport-station stop - invoke-rc.d livesupport-station kill + invoke-rc.d livesupport-station stop || true + invoke-rc.d livesupport-station kill || true else - /etc/init.d/livesupport-station stop - /etc/init.d/livesupport-station kill + /etc/init.d/livesupport-station stop || true + /etc/init.d/livesupport-station kill || true fi ;; failed-upgrade)