# HG changeset patch
# User Tero Marttila <tero.marttila@aalto.fi>
# Date 1425375602 -7200
# Node ID 09c6676a90a166c88307bdd0071ec9760cd24bc2
# Parent  4e0450dc57a9a157d899a6b4fb8ca476324039e5
lib/pvl/service: cmd_sudo restart; workaround more upstart braindamage with service ... status

diff -r 4e0450dc57a9 -r 09c6676a90a1 lib/pvl/service.sh
--- a/lib/pvl/service.sh	Tue Mar 03 11:39:07 2015 +0200
+++ b/lib/pvl/service.sh	Tue Mar 03 11:40:02 2015 +0200
@@ -25,8 +25,9 @@
 
 function service_status {
     local service=$1
-
-    if [ $SERVICE_TYPE = upstart ]; then
+    
+    # native upstart services don't exit with any status, but sysvinit compatibility ones do
+    if [ $SERVICE_TYPE = upstart -a -e /etc/init/$service.conf ]; then
         cmd_test service $service status | grep -q start
     else
         cmd_test service $service status > /dev/null
@@ -35,6 +36,6 @@
 
 function service_restart {
     local service=$1
-
-    cmd service $service restart
+    
+    cmd_sudo service $service restart
 }