[Pkg-ceph-commits] [ceph] 68/85: Remove upstart support
Gaudenz Steinlin
gaudenz at moszumanska.debian.org
Mon Dec 26 20:47:29 UTC 2016
This is an automated email from the git hooks/post-receive script.
gaudenz pushed a commit to branch jewel
in repository ceph.
commit fdec5d6a52eb176617c4101d2a4caafdf0aaf01f
Author: Gaudenz Steinlin <gaudenz at debian.org>
Date: Wed Dec 14 21:35:48 2016 +0100
Remove upstart support
Upstart won't be part of any future Debian release.
---
debian/ceph-base.lintian-overrides | 27 ---------------------------
debian/ceph-base.postinst | 8 --------
debian/ceph-base.prerm | 8 --------
debian/ceph-mds.lintian-overrides | 11 -----------
debian/ceph-mds.maintscript | 3 +++
debian/ceph-mds.postinst | 8 --------
debian/ceph-mds.prerm | 8 --------
debian/ceph-mon.postinst | 5 +----
debian/ceph-mon.prerm | 1 -
debian/ceph-osd.postinst | 5 +----
debian/ceph-osd.prerm | 1 -
debian/ceph.maintscript | 9 +++++++++
debian/radosgw.lintian-overrides | 7 -------
debian/radosgw.maintscript | 3 +++
debian/radosgw.postinst | 8 --------
debian/radosgw.prerm | 8 --------
debian/rules | 30 ------------------------------
17 files changed, 17 insertions(+), 133 deletions(-)
diff --git a/debian/ceph-base.lintian-overrides b/debian/ceph-base.lintian-overrides
index 91955c4..d4041ca 100644
--- a/debian/ceph-base.lintian-overrides
+++ b/debian/ceph-base.lintian-overrides
@@ -1,29 +1,2 @@
# False-positives:
spelling-error-in-binary * tEH the
-
-# Ceph upstart configurations don't have init.d equivalents
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-create-keys
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-create-keys
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd-all
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon-all
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-all
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-all
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-mon-all-starter
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-mon-all-starter
-ceph-base: init.d-script-not-marked-as-conffile etc/init.d/ceph-osd-all-starter
-ceph-base: init.d-script-not-included-in-package etc/init.d/ceph-osd-all-starter
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all-starter
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-create-keys
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mon-all
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/rbdmap
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-all
-ceph-base: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-osd-all-starter
diff --git a/debian/ceph-base.postinst b/debian/ceph-base.postinst
index b280af9..23712a8 100644
--- a/debian/ceph-base.postinst
+++ b/debian/ceph-base.postinst
@@ -31,14 +31,6 @@ set -e
case "$1" in
configure)
rm -f /etc/init/ceph.conf
- if [ -x /sbin/start ]; then
- invoke-rc.d ceph-all start || {
- RESULT=$?
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
- }
- fi
for DIR in `ls -1 /var/lib/ceph` ; do
if ! dpkg-statoverride --list /var/lib/ceph/$DIR >/dev/null; then
if [ -d /run/systemd/system ] && [ $DIR = 'mon' ]; then
diff --git a/debian/ceph-base.prerm b/debian/ceph-base.prerm
index be7f715..e76715e 100644
--- a/debian/ceph-base.prerm
+++ b/debian/ceph-base.prerm
@@ -5,14 +5,6 @@ set -e
case "$1" in
remove)
- if [ -x /sbin/stop ]; then
- invoke-rc.d ceph-all stop || {
- RESULT=$?
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
- }
- fi
invoke-rc.d ceph stop || {
RESULT=$?
if [ $RESULT != 100 ]; then
diff --git a/debian/ceph-mds.lintian-overrides b/debian/ceph-mds.lintian-overrides
index c883954..d4041ca 100644
--- a/debian/ceph-mds.lintian-overrides
+++ b/debian/ceph-mds.lintian-overrides
@@ -1,13 +1,2 @@
# False-positives:
spelling-error-in-binary * tEH the
-
-# Ceph upstart configuration don't have equivalent init scripts
-ceph-mds: init.d-script-not-marked-as-conffile etc/init.d/ceph-mds-all
-ceph-mds: init.d-script-not-included-in-package etc/init.d/ceph-mds-all
-ceph-mds: init.d-script-not-marked-as-conffile etc/init.d/ceph-mds
-ceph-mds: init.d-script-not-included-in-package etc/init.d/ceph-mds
-ceph-mds: init.d-script-not-marked-as-conffile etc/init.d/ceph-mds-all-starter
-ceph-mds: init.d-script-not-included-in-package etc/init.d/ceph-mds-all-starter
-ceph-mds: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mds-all
-ceph-mds: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mds
-ceph-mds: postrm-does-not-call-updaterc.d-for-init.d-script etc/init.d/ceph-mds-all-starter
diff --git a/debian/ceph-mds.maintscript b/debian/ceph-mds.maintscript
new file mode 100644
index 0000000..4e9d147
--- /dev/null
+++ b/debian/ceph-mds.maintscript
@@ -0,0 +1,3 @@
+rm_conffile /etc/init/ceph-mds-all-starter.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-mds.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-mds-all.conf 10.2.5-1~
diff --git a/debian/ceph-mds.postinst b/debian/ceph-mds.postinst
index d1c586c..f6c9f4e 100644
--- a/debian/ceph-mds.postinst
+++ b/debian/ceph-mds.postinst
@@ -24,14 +24,6 @@ set -e
case "$1" in
configure)
- if [ -x /sbin/start ]; then
- invoke-rc.d ceph-mds-all start || {
- RESULT=$?
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
- }
- fi
if ! dpkg-statoverride --list /var/lib/ceph/mds >/dev/null; then
chown $SERVER_USER:$SERVER_GROUP /var/lib/ceph/mds
fi
diff --git a/debian/ceph-mds.prerm b/debian/ceph-mds.prerm
index e952a3f..7a491aa 100644
--- a/debian/ceph-mds.prerm
+++ b/debian/ceph-mds.prerm
@@ -5,14 +5,6 @@ set -e
case "$1" in
remove)
- if [ -x /sbin/stop ]; then
- invoke-rc.d ceph-mds-all stop || {
- RESULT=$?
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
- }
- fi
invoke-rc.d ceph stop mds || {
RESULT=$?
if [ $RESULT != 100 ]; then
diff --git a/debian/ceph-mon.postinst b/debian/ceph-mon.postinst
index b33f34b..d004617 100644
--- a/debian/ceph-mon.postinst
+++ b/debian/ceph-mon.postinst
@@ -22,10 +22,7 @@ set -e
[ -z "$SERVER_GROUP" ] && SERVER_GROUP=ceph
case "$1" in
- configure)
- [ -x /sbin/start ] && start ceph-mon-all || :
- ;;
- abort-upgrade|abort-remove|abort-deconfigure)
+ configure|abort-upgrade|abort-remove|abort-deconfigure)
:
;;
diff --git a/debian/ceph-mon.prerm b/debian/ceph-mon.prerm
index 5f64058..a31fc3c 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 b642dfe..d61fe61 100644
--- a/debian/ceph-osd.postinst
+++ b/debian/ceph-osd.postinst
@@ -22,10 +22,7 @@ set -e
[ -z "$SERVER_GROUP" ] && SERVER_GROUP=ceph
case "$1" in
- configure)
- [ -x /sbin/start ] && start ceph-osd-all || :
- ;;
- abort-upgrade|abort-remove|abort-deconfigure)
+ configure|abort-upgrade|abort-remove|abort-deconfigure)
:
;;
diff --git a/debian/ceph-osd.prerm b/debian/ceph-osd.prerm
index 40f07b6..93c4596 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/ceph.maintscript b/debian/ceph.maintscript
index f0d7070..238a3f2 100644
--- a/debian/ceph.maintscript
+++ b/debian/ceph.maintscript
@@ -1 +1,10 @@
rm_conffile /etc/logrotate.d/ceph 10.2.3-0ubuntu5~
+rm_conffile /etc/init/ceph-osd.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-osd-all-starter.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-create-keys.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-osd-all.conf 10.2.5-1~
+rm_conffile /etc/init/rbdmap.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-mon-all-starter.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-all.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-mon.conf 10.2.5-1~
+rm_conffile /etc/init/ceph-mon-all.conf 10.2.5-1~
diff --git a/debian/radosgw.lintian-overrides b/debian/radosgw.lintian-overrides
deleted file mode 100644
index 326e9c4..0000000
--- a/debian/radosgw.lintian-overrides
+++ /dev/null
@@ -1,7 +0,0 @@
-# Ceph upstart configuration's don't have init.d equivalents
-radosgw: init.d-script-not-marked-as-conffile etc/init.d/radosgw-all-starter
-radosgw: init.d-script-not-included-in-package etc/init.d/radosgw-all-starter
-radosgw: init.d-script-not-marked-as-conffile etc/init.d/radosgw-instance
-radosgw: init.d-script-not-included-in-package etc/init.d/radosgw-instance
-radosgw: init.d-script-not-marked-as-conffile etc/init.d/radosgw-all
-radosgw: init.d-script-not-included-in-package etc/init.d/radosgw-all
diff --git a/debian/radosgw.maintscript b/debian/radosgw.maintscript
new file mode 100644
index 0000000..2219c10
--- /dev/null
+++ b/debian/radosgw.maintscript
@@ -0,0 +1,3 @@
+rm_conffile /etc/init/radosgw-all-starter.conf 10.2.5-1~
+rm_conffile /etc/init/radosgw-instance.conf 10.2.5-1~
+rm_conffile /etc/init/radosgw-all.conf 10.2.5-1~
diff --git a/debian/radosgw.postinst b/debian/radosgw.postinst
index b886c05..2e88a07 100644
--- a/debian/radosgw.postinst
+++ b/debian/radosgw.postinst
@@ -30,14 +30,6 @@ set -e
case "$1" in
configure)
- if [ -x /sbin/start ]; then
- invoke-rc.d radosgw-all start || {
- RESULT=$?
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
- }
- fi
if ! dpkg-statoverride --list /var/lib/ceph/radosgw >/dev/null; then
chown $SERVER_USER:$SERVER_GROUP /var/lib/ceph/radosgw
fi
diff --git a/debian/radosgw.prerm b/debian/radosgw.prerm
index baae241..0288ab7 100644
--- a/debian/radosgw.prerm
+++ b/debian/radosgw.prerm
@@ -5,14 +5,6 @@ set -e
case "$1" in
remove)
- if [ -x /sbin/stop ]; then
- invoke-rc.d radosgw-all stop || {
- RESULT=$?
- if [ $RESULT != 100 ]; then
- exit $RESULT
- fi
- }
- fi
invoke-rc.d radosgw stop || {
RESULT=$?
if [ $RESULT != 100 ]; then
diff --git a/debian/rules b/debian/rules
index 572a94c..211a048 100755
--- a/debian/rules
+++ b/debian/rules
@@ -60,14 +60,6 @@ override_dh_autoreconf:
override_dh_auto_configure:
dh_auto_configure -- $(extraopts)
-override_dh_auto_build:
- dh_auto_build
- cp -v src/upstart/rbdmap.conf debian/ceph-common.rbdmap.upstart
-
-override_dh_auto_clean:
- dh_auto_clean
- rm -fv debian/*.upstart
-
override_dh_install:
# remove .la files, we don't want to install these in Debian,
# see Policy 10.2
@@ -88,28 +80,6 @@ override_dh_install:
override_dh_installinit:
dh_installinit --no-start
dh_installinit -pceph-common --no-start --name=rbdmap
- # Install upstart configurations using dh_installinit
- for conf in `ls -1 src/upstart/ceph*.conf | grep -v mds`; do \
- name=`basename $$conf | cut -d . -f 1`; \
- cp -v $$conf debian/ceph.$$name.upstart; \
- dh_installinit -pceph --no-start --name=$$name; \
- done
- for conf in `ls -1 src/upstart/ceph-mds*.conf`; do \
- name=`basename $$conf | cut -d . -f 1`; \
- cp -v $$conf debian/ceph-mds.$$name.upstart; \
- dh_installinit -pceph-mds --no-start --name=$$name; \
- done
- for conf in `ls -1 src/upstart/radosgw*.conf`; do \
- name=`basename $$conf | cut -d . -f 1`; \
- [ $$name = "radosgw" ] && name="radosgw-instance";\
- cp -v $$conf debian/radosgw.$$name.upstart; \
- dh_installinit -pradosgw --no-start --name=$$name; \
- done
- for conf in `ls -1 src/upstart/ceph-rbd-mirror*.conf`; do \
- name=`basename $$conf | cut -d . -f 1`; \
- cp -v $$conf debian/rbd-mirror.$$name.upstart; \
- dh_installinit -prbd-mirror --no-start --name=$$name; \
- done
# install the systemd stuff manually since we have funny service names
# and need to update the paths in all of the files post install
# systemd:ceph-common
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git
More information about the Pkg-ceph-commits
mailing list