From 58e993cdad519f44ec17d625b080e66caa3eebd8 Mon Sep 17 00:00:00 2001
From: Mykola Malkov <mmalkov@sipwise.com>
Date: Wed, 13 Jun 2018 11:25:58 +0200
Subject: [PATCH] TT#37257 Remove kills of possible running processes

All the services which are run within chroot are stopped when they
are not needed anymore. So it makes no sense trying to kill them
by list moreover the list is outdated.

Here is the ps output before and after these kills:
https://paste.mgm.sipwise.com/show/4107/
there is no services from chroot.

Add debug output of 'systemctl status' if someone uses mountpoint
$TARGET.

Change-Id: I90f0c18157040929aaa52ec572babea1b0bf2eb1
---
 templates/scripts/includes/deployment.sh | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/templates/scripts/includes/deployment.sh b/templates/scripts/includes/deployment.sh
index dddc9a4..e03c806 100755
--- a/templates/scripts/includes/deployment.sh
+++ b/templates/scripts/includes/deployment.sh
@@ -2114,19 +2114,6 @@ EOF
 
 fi # if [ -n "$PUPPET" ] ; then
 
-# check the processes which are not stopped in installer and running
-logit "Before stopping all the services"
-ps auxwww || true
-# make sure we don't leave any running processes
-for i in asterisk atd collectd collectdmon dbus-daemon exim4 \
-         glusterd glusterfs glusterfsd glusterfs-server haveged monit nscd \
-	 redis-server snmpd voisniff-ng ; do
-  killall -9 $i >/dev/null 2>&1 || true
-done
-# check the processes which are not stopped in installer and running
-logit "After stopping all the services"
-ps auxwww || true
-
 # remove retrieved and generated files
 rm -f ${TARGET}/config_*yml
 rm -f ${TARGET}/constants_*.yml
@@ -2153,7 +2140,7 @@ dmsetup remove_all || true
 
 if ! blockdev --rereadpt "/dev/${DISK}" ; then
   echo "Something on disk /dev/${DISK} (mountpoint $TARGET) seems to be still active, debugging output follows:"
-  ps auxwww || true
+  systemctl status
 fi
 
 # party time! who brings the whiskey?