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

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

Description of the change

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

Commented in bug.

review: Needs Fixing

Unmerged revisions

65. 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
=== modified file 'debian/changelog'
--- debian/changelog 2014-03-27 01:20:08 +0000
+++ debian/changelog 2015-02-02 19:59:31 +0000
@@ -1,3 +1,9 @@
1mongodb (1:2.4.9-1ubuntu3) trusty; urgency=medium
2
3 * d/mongodb-server.mongodb.upstart: use pidfile (LP: #1417229).
4
5 -- Jay R. Wren <jrwren@xmtp.net> Mon, 02 Feb 2015 14:46:34 -0500
6
1mongodb (1:2.4.9-1ubuntu2) trusty; urgency=medium7mongodb (1:2.4.9-1ubuntu2) trusty; urgency=medium
28
3 * d/p/0099-Pagesize-hacks.patch: Apply some hacks for non-4k pages.9 * d/p/0099-Pagesize-hacks.patch: Apply some hacks for non-4k pages.
410
=== modified file 'debian/mongodb-server.mongodb.upstart'
--- debian/mongodb-server.mongodb.upstart 2014-03-06 11:08:10 +0000
+++ debian/mongodb-server.mongodb.upstart 2015-02-02 19:59:31 +0000
@@ -15,11 +15,14 @@
1515
16script16script
17 ENABLE_MONGODB="yes"17 ENABLE_MONGODB="yes"
18 PIDFILE=/var/run/mongodb/mongod.pid
18 if [ -f /etc/default/mongodb ]; then19 if [ -f /etc/default/mongodb ]; then
19 . /etc/default/mongodb20 . /etc/default/mongodb
20 fi21 fi
21 if [ "x$ENABLE_MONGODB" = "xyes" ]; then22 if [ "x$ENABLE_MONGODB" = "xyes" ]; then
22 exec start-stop-daemon --start --quiet --chuid mongodb \23 exec start-stop-daemon --start --quiet --chuid mongodb \
23 --exec /usr/bin/mongod -- --config /etc/mongodb.conf24 --pidfile $PIDFILE \
25 --exec /usr/bin/mongod -- --config /etc/mongodb.conf \
26 --pidfilepath $PIDFILE
24 fi27 fi
25end script28end script

Subscribers

People subscribed via source and target branches

to all changes: