[pkg-eucalyptus-commits] r48 - eucalyptus/trunk/debian

[Chris Grzegorczyk]

Author: grze-guest
Date: 2010-05-05 19:20:52 +0000 (Wed, 05 May 2010)
New Revision: 48

Modified:
   eucalyptus/trunk/debian/eucalyptus-cloud.postinst
   eucalyptus/trunk/debian/eucalyptus-sc.postinst
   eucalyptus/trunk/debian/eucalyptus-walrus.postinst
Log:
fix init calls

Modified: eucalyptus/trunk/debian/eucalyptus-cloud.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-cloud.postinst	2010-05-05 19:15:22 UTC (rev 47)
+++ eucalyptus/trunk/debian/eucalyptus-cloud.postinst	2010-05-05 19:20:52 UTC (rev 48)
@@ -10,8 +10,10 @@
         chmod 700 /var/lib/eucalyptus/db
     fi
     /usr/sbin/euca_conf --enable cloud
-    if [ -e /etc/init.d/eucalyptus-cloud ]; then
-        /etc/init.d/eucalyptus-cloud restart || :
+    if which invoke-rc.d >/dev/null 2>&1; then
+        invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
+    else
+        /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
     fi
 fi
 

Modified: eucalyptus/trunk/debian/eucalyptus-sc.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-sc.postinst	2010-05-05 19:15:22 UTC (rev 47)
+++ eucalyptus/trunk/debian/eucalyptus-sc.postinst	2010-05-05 19:20:52 UTC (rev 48)
@@ -4,8 +4,10 @@
 
 if [ "$1" = "configure" ]; then
     /usr/sbin/euca_conf --enable sc
-    if [ -e /etc/init.d/eucalyptus-cloud ]; then
-        /etc/init.d/eucalyptus-cloud restart || true
+    if which invoke-rc.d >/dev/null 2>&1; then
+        invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
+    else
+        /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
     fi
 fi
 

Modified: eucalyptus/trunk/debian/eucalyptus-walrus.postinst
===================================================================
--- eucalyptus/trunk/debian/eucalyptus-walrus.postinst	2010-05-05 19:15:22 UTC (rev 47)
+++ eucalyptus/trunk/debian/eucalyptus-walrus.postinst	2010-05-05 19:20:52 UTC (rev 48)
@@ -4,9 +4,9 @@
 
 if [ "$1" = "configure" ]; then
     /usr/sbin/euca_conf --enable walrus
-    if [ -e /etc/init.d/eucalyptus-cloud ]; then
-        /etc/init.d/eucalyptus-cloud restart || true
+    if which invoke-rc.d >/dev/null 2>&1; then
+        invoke-rc.d eucalyptus-cloud stop > /dev/null 2>&1 ||true
+    else
+        /etc/init.d/eucalyptus-cloud stop > /dev/null 2>&1 ||true
     fi
-fi
-
 exit 0