Ubuntu
mongodb package

Merge lp:~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702 into lp:ubuntu/utopic/mongodb

  1. Utopic (14.10)
  2. upstart-workaround-debian-bug-718702
  3. Merge into utopic
Proposed by Jay R. Wren
Status: Work in progress
Proposed branch: lp:~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702
Merge into: lp:ubuntu/utopic/mongodb
Diff against target: 42 lines (+10/-3)
2 files modified
debian/changelog (+6/-0)
debian/mongodb-server.mongodb.upstart (+4/-3)
To merge this branch: bzr merge lp:~evarlast/ubuntu/utopic/mongodb/upstart-workaround-debian-bug-718702
Reviewer Review Type Date Requested Status
Robie Basak Needs Fixing
Review via email: mp+248293@code.launchpad.net

Description of the change

Work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718702

To post a comment you must log in.
Revision history for this message
Robie Basak (racb) wrote :

Commented in bug.

review: Needs Fixing
Reply

Unmerged revisions

73. By Jay R. Wren

update changelog

72. By Jay R. Wren

use pidfile in upstart script

work around https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718702

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-08-15 15:11:22 +0000
3+++ debian/changelog 2015-02-02 18:55:12 +0000
4@@ -1,3 +1,9 @@
5+mongodb (1:2.6.3-0ubuntu6) utopic; urgency=medium
6+
7+ * d/mongodb-server.mongodb.upstart: use pidfile (works around #718702)
8+
9+ -- Jay R. Wren <jrwren@xmtp.net> Mon, 02 Feb 2015 13:44:49 -0500
10+
11 mongodb (1:2.6.3-0ubuntu5) utopic; urgency=medium
12
13 * d/p/fix-signed-checks.patch: Fixup comparisons between signed and
14
15=== modified file 'debian/mongodb-server.mongodb.upstart'
16--- debian/mongodb-server.mongodb.upstart 2014-07-03 09:23:46 +0000
17+++ debian/mongodb-server.mongodb.upstart 2015-02-02 18:55:12 +0000
18@@ -26,6 +26,7 @@
19 CONF=/etc/mongodb.conf
20 DAEMON=/usr/bin/mongod
21 DAEMONUSER=${DAEMONUSER:-mongodb}
22+ PIDFILE=/var/run/mongodb/mongod.pid
23
24 if [ -f /etc/default/mongodb ]; then
25 . /etc/default/mongodb
26@@ -37,13 +38,13 @@
27 if which numactl >/dev/null 2>/dev/null && numactl $NUMACTL_ARGS ls / >/dev/null 2>/dev/null
28 then
29 NUMACTL="$(which numactl) -- $NUMACTL_ARGS"
30- DAEMON_OPTS=${DAEMON_OPTS:-"--config $CONF"}
31+ DAEMON_OPTS=${DAEMON_OPTS:-"--config $CONF --pidfilepath $PIDFILE"}
32 else
33 NUMACTL=""
34- DAEMON_OPTS="-- "${DAEMON_OPTS:-"--config $CONF"}
35+ DAEMON_OPTS="-- "${DAEMON_OPTS:-"--config $CONF --pidfilepath $PIDFILE"}
36 fi
37
38 if [ "x$ENABLE_MONGODB" = "xyes" ]; then
39- exec start-stop-daemon --start --chuid $DAEMONUSER --exec $NUMACTL $DAEMON $DAEMON_OPTS
40+ exec start-stop-daemon --start --chuid $DAEMONUSER --pidfile $PIDFILE --exec $NUMACTL $DAEMON $DAEMON_OPTS
41 fi
42 end script

Subscribers

People subscribed via source and target branches

to all changes: