From 08fcf91bd5b11080bf8b41486d004ce534f60c78 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 4 Feb 2024 00:12:09 +0800 Subject: [PATCH] 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 --- debian/ceph-base.postinst | 1 - debian/ceph-base.prerm | 1 - debian/ceph-mds.postinst | 2 -- debian/ceph-mds.prerm | 1 - debian/ceph-mgr.postinst | 2 -- debian/ceph-mgr.prerm | 1 - debian/ceph-mon.postinst | 2 +- debian/ceph-mon.prerm | 1 - debian/ceph-osd.postinst | 1 - debian/ceph-osd.prerm | 1 - debian/radosgw.postinst | 2 -- debian/radosgw.prerm | 1 - 12 files changed, 1 insertion(+), 15 deletions(-) diff --git a/debian/ceph-base.postinst b/debian/ceph-base.postinst index 75eeb59c624..3a51b50cbc2 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 bfd7d3d6fb2..12e5da7d633 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 b69efedaafb..2fad7537b94 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 654518a7d55..51f30d7f98e 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 6d38ccf09fe..5223a8a83ad 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 6fb7b245a78..5e4bf42c2dd 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 688d8141d39..935a0ca55b2 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 5f64058a5da..a31fc3c2184 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 04e33b8601f..be99d1d2651 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 40f07b62152..93c459614e4 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 07e3ec30b6d..95af1c030ad 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 4120fb6272c..0288ab77b3a 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