Revert "Use dh_installinit to install upstart job files"

This reverts commit 251a6a498d07f7873b0e15b0ca2caf7f12c48f04.

This includes /etc/init.d/radosgw in the ceph package, which makes it
conflict with radosgw.

diff --git a/debian/ceph-mds.ceph-mds-all-starter.upstart b/debian/ceph-mds.ceph-mds-all-starter.upstart
deleted file mode 120000 (symlink)
index 10f99a6..0000000
--- a/debian/ceph-mds.ceph-mds-all-starter.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-mds-all-starter.conf
\ No newline at end of file

diff --git a/debian/ceph-mds.ceph-mds-all.upstart b/debian/ceph-mds.ceph-mds-all.upstart
deleted file mode 120000 (symlink)
index e824733..0000000
--- a/debian/ceph-mds.ceph-mds-all.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-mds-all.conf
\ No newline at end of file

diff --git a/debian/ceph-mds.ceph-mds.upstart b/debian/ceph-mds.ceph-mds.upstart
deleted file mode 120000 (symlink)
index 8b3b096..0000000
--- a/debian/ceph-mds.ceph-mds.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-mds.conf
\ No newline at end of file

diff --git a/debian/ceph.ceph-all.upstart b/debian/ceph.ceph-all.upstart
deleted file mode 120000 (symlink)
index 60726f3..0000000
--- a/debian/ceph.ceph-all.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-all.conf
\ No newline at end of file

diff --git a/debian/ceph.ceph-create-keys.upstart b/debian/ceph.ceph-create-keys.upstart
deleted file mode 120000 (symlink)
index d8d704f..0000000
--- a/debian/ceph.ceph-create-keys.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-create-keys.conf
\ No newline at end of file

diff --git a/debian/ceph.ceph-mon-all-starter.upstart b/debian/ceph.ceph-mon-all-starter.upstart
deleted file mode 120000 (symlink)
index d7452d0..0000000
--- a/debian/ceph.ceph-mon-all-starter.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-mon-all-starter.conf
\ No newline at end of file

diff --git a/debian/ceph.ceph-mon-all.upstart b/debian/ceph.ceph-mon-all.upstart
deleted file mode 120000 (symlink)
index 8aec0a0..0000000
--- a/debian/ceph.ceph-mon-all.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-mon-all.conf
\ No newline at end of file

diff --git a/debian/ceph.ceph-mon.upstart b/debian/ceph.ceph-mon.upstart
deleted file mode 120000 (symlink)
index f953fd0..0000000
--- a/debian/ceph.ceph-mon.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-mon.conf
\ No newline at end of file

diff --git a/debian/ceph.ceph-osd-all-starter.upstart b/debian/ceph.ceph-osd-all-starter.upstart
deleted file mode 120000 (symlink)
index e817438..0000000
--- a/debian/ceph.ceph-osd-all-starter.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-osd-all-starter.conf
\ No newline at end of file

diff --git a/debian/ceph.ceph-osd-all.upstart b/debian/ceph.ceph-osd-all.upstart
deleted file mode 120000 (symlink)
index ddf2244..0000000
--- a/debian/ceph.ceph-osd-all.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-osd-all.conf
\ No newline at end of file

diff --git a/debian/ceph.ceph-osd.upstart b/debian/ceph.ceph-osd.upstart
deleted file mode 120000 (symlink)
index 0a23a0a..0000000
--- a/debian/ceph.ceph-osd.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/ceph-osd.conf
\ No newline at end of file

diff --git a/debian/radosgw.radowgw-all-starter.upstart b/debian/radosgw.radowgw-all-starter.upstart
deleted file mode 120000 (symlink)
index 145204e..0000000
--- a/debian/radosgw.radowgw-all-starter.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/radosgw-all-starter.conf
\ No newline at end of file

diff --git a/debian/radosgw.radowgw-all.upstart b/debian/radosgw.radowgw-all.upstart
deleted file mode 120000 (symlink)
index 5312a65..0000000
--- a/debian/radosgw.radowgw-all.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/radosgw-all.conf
\ No newline at end of file

diff --git a/debian/radosgw.radowgw.upstart b/debian/radosgw.radowgw.upstart
deleted file mode 120000 (symlink)
index 6faf46e..0000000
--- a/debian/radosgw.radowgw.upstart
+++ /dev/null
@@ -1 +0,0 @@
-../src/upstart/radosgw.conf
\ No newline at end of file

diff --git a/debian/rules b/debian/rules
index dc0710a841f605a093fa67858db00b65bd486278..c32c3e280b3852fc807085eb588cd2e63d376323 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -114,25 +114,15 @@ binary-arch: build install
        dh_installexamples -a
        dh_install -a --sourcedir=$(DESTDIR) --list-missing
        dh_installlogrotate -a
-       #upstart job files for binary package ceph
-       dh_installinit --no-start --name=ceph-all
-       dh_installinit --no-start --name=ceph-create-keys
-       dh_installinit --no-start --name=ceph-mon-all-starter
-       dh_installinit --no-start --name=ceph-mon-all
-       dh_installinit --no-start --name=ceph-mon
-       dh_installinit --no-start --name=ceph-osd-all-starter
-       dh_installinit --no-start --name=ceph-osd-all
-       dh_installinit --no-start --name=ceph-osd
-       #upstart job files for binary package ceph-mds
-       dh_installinit --no-start --name=ceph-mds-all
-       dh_installinit --no-start --name=ceph-mds-all-starter
-       dh_installinit --no-start --name=ceph-mds
-       #upstart job files for binary package radowgw
-       dh_installinit --no-start --name=radosgw-all-starter
-       dh_installinit --no-start --name=radosgw-all
-       dh_installinit --no-start --name=radosgw
-       #all other initscripts
-       dh_installinit --no-start
+       dh_installinit -a --no-start
+       # dh_installinit is only set up to handle one upstart script
+       # per package, so do this ourselves
+       install -d -m0755 debian/ceph/etc/init
+       install -m0644 src/upstart/ceph*.conf debian/ceph/etc/init
+       install -d -m0755 debian/ceph-mds/etc/init
+       mv debian/ceph/etc/init/ceph-mds* debian/ceph-mds/etc/init
+       install -d -m0755 debian/radosgw/etc/init
+       install -m0644 src/upstart/radosgw*.conf debian/radosgw/etc/init
        dh_installman -a
        dh_lintian -a
        dh_link -a