Merge pull request ceph#55437 from tchaikov/ehh-upstart

debian: do not use upstart to start/stop services Reviewed-by: Casey Bodley <[email protected]>
cybozu · May 8, 2024 · 720f8e9 · 720f8e9
2 parents 9b6d380 + 08fcf91
commit 720f8e9
Show file tree

Hide file tree

Showing 12 changed files with 1 addition and 15 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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