From 605c69c975fd0060f51ad9b110ea4b20c2786e01 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 10 Nov 2011 14:27:49 -0500 Subject: [PATCH] CC-2978: Install fails on Ubuntu 11.10 -initial commit --- install_minimal/airtime-install | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 7aa9c963e..f62daa600 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -47,8 +47,17 @@ $SCRIPTPATH/include/airtime-initialize.sh $@ #Hack to parse rabbitmq pid and place it into the correct directory. This is also #done in our rabbitmq init.d script, but placing it here so that monit recognizes -# it faster (in time for the airtime-check-system) -sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids > /var/run/rabbitmq.pid +# it faster (in time for the upcoming airtime-check-system) +codename=`lsb_release -cs` +if [ "$codename" == "oneiric" ]; +then + rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"` + rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"` +else + rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids` +fi +echo "RabbitMQ PID: $rabbitmqpid" +echo "$rabbitmqpid" > /var/run/rabbitmq.pid echo -e "\n*** Verifying your system environment, running airtime-check-system ***" sleep 10