From: Kefu Chai <tchaikov@gmail.com>
Date: Sat, 3 Feb 2024 16:12:09 +0000 (+0800)
Subject: debian: do not use upstart to start/stop services
X-Git-Tag: v20.0.0~1991^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=08fcf91bd5b11080bf8b41486d004ce534f60c78;p=ceph.git

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 75eeb59c6246..3a51b50cbc21 100644
--- 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 bfd7d3d6fb27..12e5da7d6331 100644
--- 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 b69efedaafb0..2fad7537b94b 100644
--- 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 654518a7d552..51f30d7f98e1 100644
--- 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 6d38ccf09feb..5223a8a83ad2 100644
--- 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 6fb7b245a78e..5e4bf42c2dda 100644
--- 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 688d8141d39a..935a0ca55b28 100644
--- 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 5f64058a5da1..a31fc3c21842 100644
--- 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 04e33b8601f9..be99d1d26513 100644
--- 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 40f07b62152e..93c459614e44 100644
--- 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 07e3ec30b6d3..95af1c030ad9 100644
--- 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 4120fb6272c1..0288ab77b3a3 100644
--- 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