[Pkg-ceph-commits] [ceph] 03/03: d/p/drop-user-group-osd-prestart.patch: Drop --setuser/--setgroup arguments from call to ceph-osd-prestart.sh; they are not supported and generate spurious non-fatal warning messages (LP: #1557461).

[James Downing Page]

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

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

commit 6930865965fc555f95a1dffbd8d8c9bad6b9b622
Author: James Page <james.page at ubuntu.com>
Date:   Tue Apr 5 17:04:31 2016 +0100

    d/p/drop-user-group-osd-prestart.patch: Drop --setuser/--setgroup arguments from call to ceph-osd-prestart.sh; they are not supported and generate spurious non-fatal warning messages (LP: #1557461).
---
 debian/changelog                                  |  3 +++
 debian/patches/drop-user-group-osd-prestart.patch | 22 ++++++++++++++++++++++
 debian/patches/series                             |  2 ++
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d61e2fd..9b2a901 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,9 @@ ceph (10.1.0-0ubuntu1) UNRELEASED; urgency=medium
   * d/rules: Install upstart and systemd configurations for rbd-mirror.
   * d/copyright: Ensure that jerasure and gf-complete are not stripped
     from the upstream release tarball.
+  * d/p/drop-user-group-osd-prestart.patch: Drop --setuser/--setgroup
+    arguments from call to ceph-osd-prestart.sh; they are not supported
+    and generate spurious non-fatal warning messages (LP: #1557461).
 
  -- James Page <james.page at ubuntu.com>  Wed, 30 Mar 2016 09:12:17 +0100
 
diff --git a/debian/patches/drop-user-group-osd-prestart.patch b/debian/patches/drop-user-group-osd-prestart.patch
new file mode 100644
index 0000000..3e57e37
--- /dev/null
+++ b/debian/patches/drop-user-group-osd-prestart.patch
@@ -0,0 +1,22 @@
+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 1f934af..6dd8723 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,3 +17,5 @@ fix-cycles-arch.patch
 rocksdb-flags.patch
 skip-setup.py-makefiles.patch
 disable-openssl-linking.patch
+32bit-compat.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