From e747fa8e32021b6fbc85384128133cf5289bcfa8 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 30 Jul 2013 13:31:35 -0700 Subject: [PATCH] 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. --- debian/ceph-mds.ceph-mds-all-starter.upstart | 1 - debian/ceph-mds.ceph-mds-all.upstart | 1 - debian/ceph-mds.ceph-mds.upstart | 1 - debian/ceph.ceph-all.upstart | 1 - debian/ceph.ceph-create-keys.upstart | 1 - debian/ceph.ceph-mon-all-starter.upstart | 1 - debian/ceph.ceph-mon-all.upstart | 1 - debian/ceph.ceph-mon.upstart | 1 - debian/ceph.ceph-osd-all-starter.upstart | 1 - debian/ceph.ceph-osd-all.upstart | 1 - debian/ceph.ceph-osd.upstart | 1 - debian/radosgw.radowgw-all-starter.upstart | 1 - debian/radosgw.radowgw-all.upstart | 1 - debian/radosgw.radowgw.upstart | 1 - debian/rules | 28 +++++++------------- 15 files changed, 9 insertions(+), 33 deletions(-) delete mode 120000 debian/ceph-mds.ceph-mds-all-starter.upstart delete mode 120000 debian/ceph-mds.ceph-mds-all.upstart delete mode 120000 debian/ceph-mds.ceph-mds.upstart delete mode 120000 debian/ceph.ceph-all.upstart delete mode 120000 debian/ceph.ceph-create-keys.upstart delete mode 120000 debian/ceph.ceph-mon-all-starter.upstart delete mode 120000 debian/ceph.ceph-mon-all.upstart delete mode 120000 debian/ceph.ceph-mon.upstart delete mode 120000 debian/ceph.ceph-osd-all-starter.upstart delete mode 120000 debian/ceph.ceph-osd-all.upstart delete mode 120000 debian/ceph.ceph-osd.upstart delete mode 120000 debian/radosgw.radowgw-all-starter.upstart delete mode 120000 debian/radosgw.radowgw-all.upstart delete mode 120000 debian/radosgw.radowgw.upstart diff --git a/debian/ceph-mds.ceph-mds-all-starter.upstart b/debian/ceph-mds.ceph-mds-all-starter.upstart deleted file mode 120000 index 10f99a68f7705..0000000000000 --- 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 index e82473373261a..0000000000000 --- 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 index 8b3b09676c42c..0000000000000 --- 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 index 60726f313f3fa..0000000000000 --- 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 index d8d704f23610d..0000000000000 --- 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 index d7452d091ba9a..0000000000000 --- 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 index 8aec0a0887cb7..0000000000000 --- 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 index f953fd09668bc..0000000000000 --- 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 index e8174389a5e93..0000000000000 --- 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 index ddf22445958bc..0000000000000 --- 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 index 0a23a0aaf7bda..0000000000000 --- 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 index 145204eeaacd2..0000000000000 --- 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 index 5312a654ddf0c..0000000000000 --- 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 index 6faf46ed540b0..0000000000000 --- 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 dc0710a841f60..c32c3e280b385 100755 --- 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 -- 2.39.5