Merge lp:~lynxman/ubuntu/natty/mcollective/natty-upstart into lp:ubuntu/natty/mcollective

Proposed by Marc Cluet
Status: Needs review
Proposed branch: lp:~lynxman/ubuntu/natty/mcollective/natty-upstart
Merge into: lp:ubuntu/natty/mcollective
Diff against target: 40 lines (+10/-2)
3 files modified
debian/changelog (+7/-0)
debian/mcollective.upstart (+2/-2)
etc/client.cfg.dist (+1/-0)
To merge this branch: bzr merge lp:~lynxman/ubuntu/natty/mcollective/natty-upstart
Reviewer Review Type Date Requested Status
Brian Murray Needs Information
Review via email: mp+58180@code.launchpad.net

Description of the change

* Changes upstart script to not daemonize, avoid multiple daemonize scenario
* Modified server.cfg to reflect change

To post a comment you must log in.
Revision history for this message
Brian Murray (brian-murray) wrote :

For this to be fixed in Natty as an SRU we'll need to have a bug report documenting the issue. (https://wiki.ubuntu.com/StableReleaseUpdates) I looked at the open mcollective bug reports and there aren't any about this particular issue. Could you report a bug following the SRU procedure if you'd like to see this fixed in Natty? Thanks in advance.

review: Needs Information

Unmerged revisions

7. By Marc Cluet

Modified upstart script

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2011-02-23 03:09:22 +0000
+++ debian/changelog 2011-04-18 19:02:27 +0000
@@ -1,3 +1,10 @@
1mcollective (1.0.1-0ubuntu3) natty; urgency=low
2
3 * Modified upstart script to avoid daemonize, this solves a multiple run
4 scenario
5
6 -- Marc Cluet <marc.cluet@ubuntu.com> Mon, 18 Apr 2011 14:48:44 -0500
7
1mcollective (1.0.1-0ubuntu2) natty; urgency=low8mcollective (1.0.1-0ubuntu2) natty; urgency=low
29
3 * debian/mcollective.triggers, debian/mcollective.postinst: install dpkg10 * debian/mcollective.triggers, debian/mcollective.postinst: install dpkg
411
=== modified file 'debian/mcollective.upstart'
--- debian/mcollective.upstart 2011-02-01 09:15:08 +0000
+++ debian/mcollective.upstart 2011-04-18 19:02:27 +0000
@@ -3,7 +3,7 @@
33
4start on runlevel [2345]4start on runlevel [2345]
5stop on runlevel [!2345]5stop on runlevel [!2345]
6expect daemon6respawn
77
8export RUBYLIB=/usr/local/lib/site_ruby/1.8:$RUBYLIB8env RUBYLIB=/usr/local/lib/site_ruby/1.8:$RUBYLIB
9exec /usr/sbin/mcollectived --pid="/var/run/mcollectived.pid" --config="/etc/mcollective/server.cfg"9exec /usr/sbin/mcollectived --pid="/var/run/mcollectived.pid" --config="/etc/mcollective/server.cfg"
1010
=== modified file 'etc/client.cfg.dist'
--- etc/client.cfg.dist 2011-02-01 09:15:08 +0000
+++ etc/client.cfg.dist 2011-04-18 19:02:27 +0000
@@ -2,6 +2,7 @@
2libdir = /usr/share/mcollective2libdir = /usr/share/mcollective
3logfile = /dev/null3logfile = /dev/null
4loglevel = info4loglevel = info
5daemonize = 0
56
6# Plugins 7# Plugins
7securityprovider = psk8securityprovider = psk

Subscribers

People subscribed via source and target branches

to all changes: