Merge pull request #463 from toabctl/upstart-handling

Use dh_installinit to install upstart job files

Reviewed-by: Gaudenz Steinlin <gaudenz@debian.org>

15 files changed, 33 insertions, 9 deletions

diff --git a/debian/ceph-mds.ceph-mds-all-starter.upstart b/debian/ceph-mds.ceph-mds-all-starter.upstart
new file mode 120000
index 00000000000..10f99a68f77
--- /dev/null
+++ b/debian/ceph-mds.ceph-mds-all-starter.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..e8247337326
--- /dev/null
+++ b/debian/ceph-mds.ceph-mds-all.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..8b3b09676c4
--- /dev/null
+++ b/debian/ceph-mds.ceph-mds.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..60726f313f3
--- /dev/null
+++ b/debian/ceph.ceph-all.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..d8d704f2361
--- /dev/null
+++ b/debian/ceph.ceph-create-keys.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..d7452d091ba
--- /dev/null
+++ b/debian/ceph.ceph-mon-all-starter.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..8aec0a0887c
--- /dev/null
+++ b/debian/ceph.ceph-mon-all.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..f953fd09668
--- /dev/null
+++ b/debian/ceph.ceph-mon.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..e8174389a5e
--- /dev/null
+++ b/debian/ceph.ceph-osd-all-starter.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..ddf22445958
--- /dev/null
+++ b/debian/ceph.ceph-osd-all.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..0a23a0aaf7b
--- /dev/null
+++ b/debian/ceph.ceph-osd.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..145204eeaac
--- /dev/null
+++ b/debian/radosgw.radowgw-all-starter.upstart
@@ -0,0 +1 @@
+../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
new file mode 120000
index 00000000000..5312a654ddf
--- /dev/null
+++ b/debian/radosgw.radowgw-all.upstart
@@ -0,0 +1 @@
+../src/upstart/radosgw-all.conf
\ No newline at end of file
diff --git a/debian/radosgw.radowgw.upstart b/debian/radosgw.radowgw.upstart
new file mode 120000
index 00000000000..6faf46ed540
--- /dev/null
+++ b/debian/radosgw.radowgw.upstart
@@ -0,0 +1 @@
+../src/upstart/radosgw.conf
\ No newline at end of file
diff --git a/debian/rules b/debian/rules
index c32c3e280b3..dc0710a841f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,15 +114,25 @@ binary-arch: build install
 	dh_installexamples -a
 	dh_install -a --sourcedir=$(DESTDIR) --list-missing
 	dh_installlogrotate -a
-	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
+	#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_installman -a
 	dh_lintian -a
 	dh_link -a