diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install index f9354622d..57573a243 100755 --- a/install_minimal/airtime-install +++ b/install_minimal/airtime-install @@ -123,13 +123,13 @@ fi #We don't want any of our python services running if we are doing an upgrade/reinstall. #They will be automatically restarted later on. if [ -e /etc/init.d/airtime-media-monitor ]; then - /etc/init.d/airtime-media-monitor stop > /dev/null 2>&1 + invoke-rc.d airtime-media-monitor stop > /dev/null 2>&1 fi if [ -e /etc/init.d/airtime-playout ]; then - /etc/init.d/airtime-playout stop > /dev/null 2>&1 + invoke-rc.d airtime-playout stop > /dev/null 2>&1 fi if [ -e /etc/init.d/airtime-show-recorder ]; then - /etc/init.d/airtime-show-recorder stop > /dev/null 2>&1 + invoke-rc.d airtime-show-recorder stop > /dev/null 2>&1 fi diff --git a/install_minimal/include/airtime-initialize.sh b/install_minimal/include/airtime-initialize.sh index 011f6e9f3..8db2d825a 100755 --- a/install_minimal/include/airtime-initialize.sh +++ b/install_minimal/include/airtime-initialize.sh @@ -46,7 +46,7 @@ fi # so we can ensure they can register with monit to monitor them when they start. # If monit is already running, this step is still useful as we need monit to # reload its config files. -/etc/init.d/monit restart +invoke-rc.d monit restart #give monit some time to boot-up before issuing commands sleep 1 diff --git a/python_apps/media-monitor/install/media-monitor-initialize.py b/python_apps/media-monitor/install/media-monitor-initialize.py index 04fcb35bb..017fdfe70 100644 --- a/python_apps/media-monitor/install/media-monitor-initialize.py +++ b/python_apps/media-monitor/install/media-monitor-initialize.py @@ -17,10 +17,10 @@ try: #Start media-monitor daemon print "* Waiting for media-monitor processes to start..." """ - p = Popen("/etc/init.d/airtime-media-monitor stop", shell=True) + p = Popen("invoke-rc.d airtime-media-monitor stop", shell=True) sts = os.waitpid(p.pid, 0)[1] """ - p = Popen("/etc/init.d/airtime-media-monitor start-no-monit", shell=True) + p = Popen("invoke-rc.d airtime-media-monitor start-no-monit", shell=True) sts = os.waitpid(p.pid, 0)[1] except Exception, e: print e diff --git a/python_apps/pypo/install/pypo-initialize.py b/python_apps/pypo/install/pypo-initialize.py index c7bed44f2..57c635660 100644 --- a/python_apps/pypo/install/pypo-initialize.py +++ b/python_apps/pypo/install/pypo-initialize.py @@ -120,14 +120,14 @@ try: """ if os.environ["liquidsoap_keep_alive"] == "f": print " * Restarting any previous Liquidsoap instances" - p = Popen("/etc/init.d/airtime-playout stop > /dev/null 2>&1", shell=True) + p = Popen("invoke-rc.d airtime-playout stop > /dev/null 2>&1", shell=True) sts = os.waitpid(p.pid, 0)[1] else: print " * Keeping any previous Liquidsoap instances running" - p = Popen("/etc/init.d/airtime-playout pypo-stop > /dev/null 2>&1", shell=True) + p = Popen("invoke-rc.d airtime-playout pypo-stop > /dev/null 2>&1", shell=True) sts = os.waitpid(p.pid, 0)[1] """ - p = Popen("/etc/init.d/airtime-playout start-no-monit > /dev/null 2>&1", shell=True) + p = Popen("invoke-rc.d airtime-playout start-no-monit > /dev/null 2>&1", shell=True) sts = os.waitpid(p.pid, 0)[1] except Exception, e: diff --git a/python_apps/pypo/install/pypo-uninitialize.py b/python_apps/pypo/install/pypo-uninitialize.py index 864d94a3d..2329e88e7 100644 --- a/python_apps/pypo/install/pypo-uninitialize.py +++ b/python_apps/pypo/install/pypo-uninitialize.py @@ -10,7 +10,7 @@ try: #stop pypo and liquidsoap processes print "Waiting for pypo processes to stop...", if (os.path.exists('/etc/init.d/airtime-playout')): - p = Popen("/etc/init.d/airtime-playout stop", shell=True) + p = Popen("invoke-rc.d airtime-playout stop", shell=True) sts = os.waitpid(p.pid, 0)[1] print "OK" else: diff --git a/python_apps/pypo/install/pypo-uninstall.py b/python_apps/pypo/install/pypo-uninstall.py index 9b4429598..f3306d9c7 100644 --- a/python_apps/pypo/install/pypo-uninstall.py +++ b/python_apps/pypo/install/pypo-uninstall.py @@ -30,7 +30,7 @@ try: print 'Error loading config file: ', e sys.exit(1) - os.system("/etc/init.d/airtime-playout stop") + os.system("invoke-rc.d airtime-playout stop") os.system("rm -f /etc/init.d/airtime-playout") os.system("update-rc.d -f airtime-playout remove >/dev/null 2>&1")