From 38b41dd1809bdf237fdff691f5445c608229944f Mon Sep 17 00:00:00 2001
From: Christoph Galuschka <christoph.galuschka@chello.at>
Date: Jun 10 2012 12:48:09 +0000
Subject: fix for httpd running sometimes in lamp test


---

diff --git a/tests/r_lamp/0_lamp_install.sh b/tests/r_lamp/0_lamp_install.sh
index ece6bbe..debd64f 100755
--- a/tests/r_lamp/0_lamp_install.sh
+++ b/tests/r_lamp/0_lamp_install.sh
@@ -5,4 +5,12 @@
 t_Log "Running $0 - attempting to install LAMP stack."
 
 t_InstallPackage httpd mysql-server php
-t_ServiceControl httpd restart
+t_ServiceControl httpd stop
+ps ax | grep -v grep | grep -q httpd
+if [ $? = 0 ]
+then
+  t_Log "httpd still running - killing"
+  killall -9 httpd
+fi
+sleep 1
+t_ServiceControl httpd start