[Pkg-ceph-commits] [ceph] 01/01: d/rules: Rename radosgw upstart configuration to ceph-radosgw to avoid namespace conflict with init script for backwards compatibility.

[James Downing Page]

This is an automated email from the git hooks/post-receive script.

jamespage pushed a commit to branch master
in repository ceph.

commit e758eaaa7b394eef0a33774d49a46f2b0c340a4d
Author: James Page <james.page at ubuntu.com>
Date:   Wed Nov 27 09:56:15 2013 +0000

    d/rules: Rename radosgw upstart configuration to ceph-radosgw to avoid namespace conflict with init script for backwards compatibility.
---
 debian/changelog | 3 +++
 debian/rules     | 1 +
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6e1392f..dfda3c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ ceph (0.72.1-3) UNRELEASED; urgency=low
 
   * d/rules,ceph.install: Correct install paths for ceph-* helpers. 
   * d/p/modules: Mark libcls_kvs.so as module.
+  * d/rules: Rename radosgw upstart configuration to ceph-radosgw to
+    avoid namespace conflict with init script which breaks backwards
+    compatibility (LP: #1255464).
 
  -- James Page <james.page at ubuntu.com>  Tue, 26 Nov 2013 22:11:19 +0000
 
diff --git a/debian/rules b/debian/rules
index 5d503f8..67133ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,6 +71,7 @@ override_dh_installinit:
     done
 	for conf in `ls -1 src/upstart/radosgw*.conf`; do \
         name=`basename $$conf | cut -d . -f 1`; \
+        [ $$name = "radosgw" ] && name="ceph-radosgw";\
         cp $$conf debian/radosgw.$$name.upstart; \
         dh_installinit -pradosgw --no-start --name=$$name; \
     done

-- 
Alioth's hooks/post-receive on /srv/git.debian.org/git/pkg-ceph/ceph.git