From b9c6eab39ccaeb65a38fe54662ff017a1a967fac Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Mon, 28 May 2012 17:42:48 -0400 Subject: [PATCH] make sure we explicitly need to tell Airtime services to start --- install_minimal/airtime-install | 1 + .../media-monitor/install/media-monitor-initialize.py | 6 +++--- python_apps/pypo/install/pypo-initialize.py | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index 5f8914df6..43302b604 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -203,6 +203,7 @@ if [ "$DO_UPGRADE" -eq "0" ]; then fi set -e +export airtime_service_start='t' $SCRIPTPATH/include/airtime-copy-files.sh $SCRIPTPATH/include/airtime-initialize.sh $@ diff --git a/python_apps/media-monitor/install/media-monitor-initialize.py b/python_apps/media-monitor/install/media-monitor-initialize.py index 41a044a48..be3d39b85 100644 --- a/python_apps/media-monitor/install/media-monitor-initialize.py +++ b/python_apps/media-monitor/install/media-monitor-initialize.py @@ -14,8 +14,8 @@ try: subprocess.call("update-rc.d airtime-media-monitor defaults >/dev/null 2>&1", shell=True) #Start media-monitor daemon - print "* Waiting for media-monitor processes to start..." - - subprocess.call("invoke-rc.d airtime-media-monitor start-no-monit", shell=True) + if "airtime_service_start" in os.environ and os.environ["airtime_service_start"] == "t": + print "* Waiting for media-monitor processes to start..." + subprocess.call("invoke-rc.d airtime-media-monitor start-no-monit", shell=True) except Exception, e: print e diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py index 82ad22875..04345790f 100644 --- a/python_apps/pypo/install/pypo-initialize.py +++ b/python_apps/pypo/install/pypo-initialize.py @@ -128,8 +128,9 @@ try: print "* Clearing previous pypo cache" subprocess.call("rm -rf '/var/tmp/airtime/pypo/cache/scheduler/*' >/dev/null 2>&1", shell=True) - print "* Waiting for pypo processes to start..." - subprocess.call("invoke-rc.d airtime-playout start-no-monit > /dev/null 2>&1", shell=True) + if "airtime_service_start" in os.environ and os.environ["airtime_service_start"] == "t": + print "* Waiting for pypo processes to start..." + subprocess.call("invoke-rc.d airtime-playout start-no-monit > /dev/null 2>&1", shell=True) except Exception, e: print e