[Merge] lp:~psusi/ubuntu/utopic/upstart/fix-reboot into lp:ubuntu/upstart

[Phillip Susi]

Phillip Susi has proposed merging lp:~psusi/ubuntu/utopic/upstart/fix-reboot into lp:ubuntu/upstart.

Requested reviews:
  Ubuntu branches (ubuntu-branches)
Related bugs:
  Bug #1174272 in upstart (Ubuntu): "'reboot now' reverting to maintenance mode"
  https://bugs.launchpad.net/ubuntu/+source/upstart/+bug/1174272

For more details, see:
https://code.launchpad.net/~psusi/ubuntu/utopic/upstart/fix-reboot/+merge/218997

The addition of the REBOOTCOMMAND support made a mistake.  The argument is only supposed to be honored in conjunction with the --force flag.  Without --force, it mistakenly caused shutdown to be called but without the -r switch, so instead of rebooting, it went to single user mode.

-- 
https://code.launchpad.net/~psusi/ubuntu/utopic/upstart/fix-reboot/+merge/218997
Your team Ubuntu branches is requested to review the proposed merge of lp:~psusi/ubuntu/utopic/upstart/fix-reboot into lp:ubuntu/upstart.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 747 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20140509/ebdfc84d/attachment.diff>