[Pkg-ceph-commits] [ceph] 33/41: d/rules, ceph-common.install: Ensure that /etc/default/ceph is a file and not a directory (LP: #1587516).

[Gaudenz Steinlin]

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

gaudenz pushed a commit to branch jewel-gaudenz
in repository ceph.

commit c99c844bb8492fecfe83d16dd923f36382721ae7
Author: James Page <james.page at ubuntu.com>
Date:   Thu Jun 2 21:01:11 2016 +0100

    d/rules,ceph-common.install: Ensure that /etc/default/ceph is a file and not a directory (LP: #1587516).
---
 debian/ceph-common.install | 1 +
 debian/rules               | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index ec83d54..b8c2e5f 100644
--- a/debian/ceph-common.install
+++ b/debian/ceph-common.install
@@ -1,6 +1,7 @@
 etc/bash_completion.d/rados
 etc/bash_completion.d/rbd
 etc/ceph/rbdmap
+etc/default/ceph
 udev/50-rbd.rules /lib/udev/rules.d
 usr/bin/ceph
 usr/bin/ceph-authtool
diff --git a/debian/rules b/debian/rules
index a361124..104b9c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -115,8 +115,6 @@ override_dh_installinit:
 	# systemd:ceph-common
 	install -d -m0755 debian/ceph-common/lib/systemd/system
 	install -m0644 systemd/ceph.target debian/ceph-common/lib/systemd/system
-	install -d -m0755 debian/ceph-common/etc/default/ceph
-	install -m0644 etc/default/ceph debian/ceph-common/etc/default/ceph
 	install -d -m0755 debian/ceph-common/usr/lib/tmpfiles.d
 	install -m 0644 -D systemd/ceph.tmpfiles.d debian/ceph-common/usr/lib/tmpfiles.d/ceph.conf
 	# systemd:ceph

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ceph/ceph.git