[Pkg-ceph-commits] [ceph] 01/01: d/rules, ceph-common.install: Ensure that /etc/default/ceph is a file and not a directory (LP: #1587516).
James Downing Page
jamespage at moszumanska.debian.org
Mon Jun 13 09:57:24 UTC 2016
This is an automated email from the git hooks/post-receive script.
jamespage pushed a commit to branch ubuntu-xenial
in repository ceph.
commit 7bcdfde7d706b375cd76efbed64618c9df278fe5
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).
(cherry picked from commit fa59515c04b27606cb9210b8afa2d8e3d6c36614)
---
debian/ceph-common.install | 1 +
debian/changelog | 2 ++
debian/rules | 2 --
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/debian/ceph-common.install b/debian/ceph-common.install
index e33b90f..b5308b8 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/changelog b/debian/changelog
index 8f7b07f..eaee189 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ceph (10.2.1-0ubuntu0.16.04.1) UNRELEASED; urgency=medium
* New upstream stable release (LP: #1585660).
- d/p/drop-user-group-osd-prestart.patch: Dropped, included upstream.
+ * d/rules,ceph-common.install: Ensure that /etc/default/ceph is a file
+ and not a directory (LP: #1587516).
-- James Page <james.page at ubuntu.com> Wed, 25 May 2016 15:29:41 +0100
diff --git a/debian/rules b/debian/rules
index a7d5091..3f1c2f1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -114,8 +114,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
More information about the Pkg-ceph-commits
mailing list