debian: do not use upstart to start/stop services

we dropped the support of upstart back in 2c755cef. there is no need
to support it anymore.

Signed-off-by: Kefu Chai <tchaikov@gmail.com>

diff --git a/debian/ceph-base.postinst b/debian/ceph-base.postinst
index 75eeb59c6246cd3dc72e6437b85af45870b25deb..3a51b50cbc2187adea0d41288dde2cb9b66aefda 100644 (file)
--- a/debian/ceph-base.postinst
+++ b/debian/ceph-base.postinst
@@ -31,7 +31,6 @@ set -e
 case "$1" in
     configure)
        rm -f /etc/init/ceph.conf
-       [ -x /sbin/start ] && start ceph-all || :
 
         # adjust file and directory permissions
        for DIR in /var/lib/ceph/* ; do

diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm
index bfd7d3d6fb2758f8ed915de0b92ca83c8afa9b68..12e5da7d63318b36df934a86eef00fd33d53eaee 100644 (file)
--- a/debian/ceph-base.prerm
+++ b/debian/ceph-base.prerm
@@ -5,7 +5,6 @@ set -e
 
 case "$1" in
     remove)
-       [ -x /sbin/stop ] && stop ceph-all || true
        invoke-rc.d ceph stop || {
            RESULT=$?
            if [ $RESULT != 100 ]; then

diff --git a/debian/ceph-mds.postinst b/debian/ceph-mds.postinst
index b69efedaafb018f54a896b9c707fefc642b7e7ed..2fad7537b94b17aef10a0cbad85853aed845e67f 100644 (file)
--- a/debian/ceph-mds.postinst
+++ b/debian/ceph-mds.postinst
@@ -24,8 +24,6 @@ set -e
 
 case "$1" in
     configure)
-       [ -x /sbin/start ] && start ceph-mds-all || :
-
        if ! dpkg-statoverride --list /var/lib/ceph/mds >/dev/null
        then
             chown $SERVER_USER:$SERVER_GROUP /var/lib/ceph/mds

diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
index 654518a7d5526d5e68cabb912a800f6e19d82783..51f30d7f98e153540fbb849997ab299671cabd4f 100644 (file)
--- a/debian/ceph-mds.prerm
+++ b/debian/ceph-mds.prerm
@@ -5,7 +5,6 @@ set -e
 
 case "$1" in
     remove)
-       [ -x /sbin/stop ] && stop ceph-mds-all || :
        invoke-rc.d ceph stop mds || {
            RESULT=$?
            if [ $RESULT != 100 ]; then

diff --git a/debian/ceph-mgr.postinst b/debian/ceph-mgr.postinst
index 6d38ccf09feb3ea3cc9c6255320485a61207be94..5223a8a83ad217c320857759057f441f2b607fb3 100644 (file)
--- a/debian/ceph-mgr.postinst
+++ b/debian/ceph-mgr.postinst
@@ -24,8 +24,6 @@ set -e
 
 case "$1" in
     configure)
-       [ -x /sbin/start ] && start ceph-mgr-all || :
-
        if ! dpkg-statoverride --list /var/lib/ceph/mgr >/dev/null
        then
             chown $SERVER_USER:$SERVER_GROUP /var/lib/ceph/mgr

diff --git a/debian/ceph-mgr.prerm b/debian/ceph-mgr.prerm
index 6fb7b245a78e25f0cc7fe68d6785b6e4a3893ec3..5e4bf42c2dda34fed502b1f8bdf06fa550723a47 100644 (file)
--- a/debian/ceph-mgr.prerm
+++ b/debian/ceph-mgr.prerm
@@ -5,7 +5,6 @@ set -e
 
 case "$1" in
     remove)
-       [ -x /sbin/stop ] && stop ceph-mgr-all || :
        invoke-rc.d ceph stop mgr || {
            RESULT=$?
            if [ $RESULT != 100 ]; then

diff --git a/debian/ceph-mon.postinst b/debian/ceph-mon.postinst
index 688d8141d39a29a37e0303127c336cd58a8cef3f..935a0ca55b28d92d509d47f8e0a1b42059f1074b 100644 (file)
--- a/debian/ceph-mon.postinst
+++ b/debian/ceph-mon.postinst
@@ -24,7 +24,7 @@ set -e
 
 case "$1" in
     configure)
-       [ -x /sbin/start ] && start ceph-mon-all || :
+    :
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
        :

diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm
index 5f64058a5da1102854796c5434b30fe5a12d5399..a31fc3c218429500169c4850cc9a3443a55eb280 100644 (file)
--- a/debian/ceph-mon.prerm
+++ b/debian/ceph-mon.prerm
@@ -5,7 +5,6 @@ set -e
 
 case "$1" in
     remove)
-       [ -x /sbin/stop ] && stop ceph-mon-all || true
        invoke-rc.d ceph stop mon || {
            RESULT=$?
            if [ $RESULT != 100 ]; then

diff --git a/debian/ceph-osd.postinst b/debian/ceph-osd.postinst
index 04e33b8601f9468a94dbfeefe21fcdbea802b966..be99d1d26513ca38de20ef19f42593f6a86d5e85 100644 (file)
--- a/debian/ceph-osd.postinst
+++ b/debian/ceph-osd.postinst
@@ -25,7 +25,6 @@ set -e
 case "$1" in
     configure)
        [ -x /etc/init.d/procps ] && invoke-rc.d procps restart || :
-       [ -x /sbin/start ] && start ceph-osd-all || :
     ;;
     abort-upgrade|abort-remove|abort-deconfigure)
        :

diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm
index 40f07b62152e502da55ce40f7a2620bcce29efae..93c459614e44dcde0eaec88625c613dbb780725c 100644 (file)
--- a/debian/ceph-osd.prerm
+++ b/debian/ceph-osd.prerm
@@ -5,7 +5,6 @@ set -e
 
 case "$1" in
     remove)
-       [ -x /sbin/stop ] && stop ceph-osd-all || true
        invoke-rc.d ceph stop osd || {
            RESULT=$?
            if [ $RESULT != 100 ]; then

diff --git a/debian/radosgw.postinst b/debian/radosgw.postinst
index 07e3ec30b6d3e19d41dfb2e3e3baa00c0d204aaa..95af1c030ad990f106b7f6eeda521e5fb45d5f1b 100644 (file)
--- a/debian/radosgw.postinst
+++ b/debian/radosgw.postinst
@@ -30,8 +30,6 @@ set -e
 
 case "$1" in
     configure)
-       [ -x /sbin/start ] && start radosgw-all || :
-
        if ! dpkg-statoverride --list /var/lib/ceph/radosgw >/dev/null
        then
             chown $SERVER_USER:$SERVER_GROUP /var/lib/ceph/radosgw

diff --git a/debian/radosgw.prerm b/debian/radosgw.prerm
index 4120fb6272c14ee1633d97af6c907def45436410..0288ab77b3a3ab3e50a4a7b40c171e0416719a57 100644 (file)
--- a/debian/radosgw.prerm
+++ b/debian/radosgw.prerm
@@ -5,7 +5,6 @@ set -e
 
 case "$1" in
     remove)
-       [ -x /sbin/stop ] && stop radosgw-all || true
        invoke-rc.d radosgw stop || {
            RESULT=$?
            if [ $RESULT != 100 ]; then