# Bazaar merge directive format 2 (Bazaar 0.90) # revision_id: karel@tomato-20120124125537-o0lji6l86toy2zz0 # target_branch: bzr+ssh://bazaar.launchpad.net/%2Bbranch/ubuntu\ # /oneiric/mcollective/ # testament_sha1: 28ce717a64729eb87ed8f3732b72aeb8d165e163 # timestamp: 2012-01-24 14:00:33 +0100 # message: Fix: only one mcollectived should be started # base_revision_id: james.westby@ubuntu.com-20110711064927-\ # cvm1qeogfvglxowr # # Begin patch === modified file 'debian/mcollective.upstart' --- debian/mcollective.upstart 2011-05-05 07:37:54 +0000 +++ debian/mcollective.upstart 2012-01-24 12:55:37 +0000 @@ -5,5 +5,6 @@ stop on runlevel [!2345] respawn +expect fork env RUBYLIB=/usr/local/lib/site_ruby/1.8:$RUBYLIB exec /usr/sbin/mcollectived --pid="/var/run/mcollectived.pid" --config="/etc/mcollective/server.cfg" # Begin bundle IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWYpbcDoAAVnfgAAQUOP/93IA AAC////wUANaSsrANbbwSSIABNTwTTTUYjEDRMagyJT1PIxKfk9ShhNPSBoaAyASJAoxNMg0SeiH lNGj1A0AYaGmgBoADQAAyGgZUCegT1DAEaDAAE0GWh8u+OK3QZbI1gRGdJ3b5yjrXz29sGN9/Rfm dvY42DG9vqLqMX/1ZA6r7ZGeV9U2FZPyHMKncrYbpDsFAvxRK9RRce0Ar763/gQLEK5o4I+40Irn jmn+tcTgJFgnKObkxRrrZtWovX1M7Tv0FLYfRhHl3ske88etQ6YKFCanTEkCyE5y43ZL8F2C/d/1 kq+eh25UKMtr7qLkoFh8JXJhSCoe4Fkt8NcUIZGOotpNIZx4Zm7bzmeQvAe9bz0ZKtLlyEy9za5r pBn4jeN3PTIOBSkKA7QGaAFxtmaq6WBQ206hJjkKTxB/SwNKoEsVJjgX1V75zOApfkxZSguiDez6 SV++QhMtuwWoyMOGq+juiVquNbnnG2bpeE4pxoThOzoagRgnEY8GubwRybfnxYnMDdCaFBzWclI4 emgOCmyLhdm4374/A6YkuWVXmHDZ/Ba9oPPiuGvQCtEYRFTAcsH+mCfyORzXn5SN6hQHAJ1LkW0a 77ybGE2xjPc1yOoV5GxLwVLjo1uj7YSelRJnJ/At/bC6bGyDcTdNemz3Bz/drNajt03ZeJ5OniDg c+tOdVxIjhbR11klaJZTakMNmjS/biFBQmXypacM9ltmIaMdwnC77nUOVi3OPjSgYhoNu39p6Plc HE8VJIjis1SYhHbQmNFXZ8iw92LfXuml1JAcXdgpd/ZWQbAs33BpOiH0kBhX+GDM+D8PYZ1V4X5W IoCV3yJhGiejTqLLDej6i8U8MhdNFJLfx4umxE8TwtOZE5QFIJBJPg80NrEHKBQ6ZpRiamRbUD0m hkDnHBgpCMI0c3LWj4Tw2rZEKjQHws9ALHtKYnSB3u3iyKQY7KCPTneRVcdYVo2minti12jNcgdV 1qdrwgLIv5ZDVZPgUiGfNWa2QNJMTIihS7pTBOsxNIy2MFARBZNEA05sci2Q2UF8DkZSgBLxQesB ZIYXUDAKQJwaIUhnMH+LuSKcKEhFLbgdAA==