[Pkg-ceph-commits] [ceph] 03/06: * New upstream version (LP: #1585660). - d/p/drop-user-group-osd-prestart.patch: Dropped, included upstream.

[James Downing Page]

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

jamespage pushed a commit to branch ubuntu-yakkety
in repository ceph.

commit 78b11cb4055a672d08e7053c7c0743b0052ebc82
Author: James Page <james.page at ubuntu.com>
Date:   Wed May 25 15:11:17 2016 +0100

    * New upstream version (LP: #1585660).
      - d/p/drop-user-group-osd-prestart.patch: Dropped, included upstream.
---
 debian/changelog                                  |  7 +++++++
 debian/patches/drop-user-group-osd-prestart.patch | 22 ----------------------
 debian/patches/series                             |  1 -
 3 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1daa325..c72337e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ceph (10.2.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * New upstream version (LP: #1585660).
+    - d/p/drop-user-group-osd-prestart.patch: Dropped, included upstream.
+
+ -- James Page <james.page at ubuntu.com>  Wed, 25 May 2016 15:10:55 +0100
+
 ceph (10.2.0-0ubuntu0.16.04.1) xenial; urgency=medium
 
   * Ceph Jewel stable release (LP: #1563714).
diff --git a/debian/patches/drop-user-group-osd-prestart.patch b/debian/patches/drop-user-group-osd-prestart.patch
deleted file mode 100644
index 3e57e37..0000000
--- a/debian/patches/drop-user-group-osd-prestart.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: Drop user/group arguments for prestart
- These are not supported by /usr/lib/ceph/ceph-osd-prestart.sh,
- resulting in warnings:
-
-  ceph-osd-prestart.sh[23367]: getopt: unrecognized option '--setuser'
-  ceph-osd-prestart.sh[23367]: getopt: unrecognized option '--setgroup'
-
- --setuser and --setgroup are only needed for the ceph-osd process
-Author: James Page <james.page at ubuntu.com>
-Forwarded: https://github.com/ceph/ceph/pull/8449
-
---- a/systemd/ceph-osd at .service
-+++ b/systemd/ceph-osd at .service
-@@ -10,7 +10,7 @@ LimitNPROC=1048576
- EnvironmentFile=-/etc/sysconfig/ceph
- Environment=CLUSTER=ceph
- ExecStart=/usr/bin/ceph-osd -f --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
--ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i --setuser ceph --setgroup ceph
-+ExecStartPre=/usr/lib/ceph/ceph-osd-prestart.sh --cluster ${CLUSTER} --id %i
- ExecReload=/bin/kill -HUP $MAINPID
- ProtectHome=true
- ProtectSystem=full
diff --git a/debian/patches/series b/debian/patches/series
index afc110d..1f934af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,4 +17,3 @@ fix-cycles-arch.patch
 rocksdb-flags.patch
 skip-setup.py-makefiles.patch
 disable-openssl-linking.patch
-drop-user-group-osd-prestart.patch

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