mirror of
https://github.com/ceph/ceph
synced 2024-12-28 06:23:08 +00:00
Revert "Use dh_installinit to install upstart job files"
This reverts commit 251a6a498d
.
This includes /etc/init.d/radosgw in the ceph package, which makes it
conflict with radosgw.
This commit is contained in:
parent
3f5352ac67
commit
e747fa8e32
1
debian/ceph-mds.ceph-mds-all-starter.upstart
vendored
1
debian/ceph-mds.ceph-mds-all-starter.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-mds-all-starter.conf
|
1
debian/ceph-mds.ceph-mds-all.upstart
vendored
1
debian/ceph-mds.ceph-mds-all.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-mds-all.conf
|
1
debian/ceph-mds.ceph-mds.upstart
vendored
1
debian/ceph-mds.ceph-mds.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-mds.conf
|
1
debian/ceph.ceph-all.upstart
vendored
1
debian/ceph.ceph-all.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-all.conf
|
1
debian/ceph.ceph-create-keys.upstart
vendored
1
debian/ceph.ceph-create-keys.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-create-keys.conf
|
1
debian/ceph.ceph-mon-all-starter.upstart
vendored
1
debian/ceph.ceph-mon-all-starter.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-mon-all-starter.conf
|
1
debian/ceph.ceph-mon-all.upstart
vendored
1
debian/ceph.ceph-mon-all.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-mon-all.conf
|
1
debian/ceph.ceph-mon.upstart
vendored
1
debian/ceph.ceph-mon.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-mon.conf
|
1
debian/ceph.ceph-osd-all-starter.upstart
vendored
1
debian/ceph.ceph-osd-all-starter.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-osd-all-starter.conf
|
1
debian/ceph.ceph-osd-all.upstart
vendored
1
debian/ceph.ceph-osd-all.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-osd-all.conf
|
1
debian/ceph.ceph-osd.upstart
vendored
1
debian/ceph.ceph-osd.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/ceph-osd.conf
|
1
debian/radosgw.radowgw-all-starter.upstart
vendored
1
debian/radosgw.radowgw-all-starter.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/radosgw-all-starter.conf
|
1
debian/radosgw.radowgw-all.upstart
vendored
1
debian/radosgw.radowgw-all.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/radosgw-all.conf
|
1
debian/radosgw.radowgw.upstart
vendored
1
debian/radosgw.radowgw.upstart
vendored
@ -1 +0,0 @@
|
||||
../src/upstart/radosgw.conf
|
28
debian/rules
vendored
28
debian/rules
vendored
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user