~xnox/upstart/upstart-async-run-dead-code

« back to all changes in this revision

Viewing changes to util/reboot.c

  • Committer: James Hunt
  • Date: 2014-06-04 15:39:15 UTC
  • mfrom: (1628 upstart)
  • mto: This revision was merged to the branch mainline in revision 1630.
  • Revision ID: james.hunt@ubuntu.com-20140604153915-bi501sph2duo73f6
* Sync with lp:upstart.

Show diffs side-by-side

added added

removed removed

Lines of Context:
188
188
                mode = POWEROFF;
189
189
 
190
190
        /* Check for rebootcommand to pass in the syscall */
191
 
        if ((mode == REBOOT) && args && *args) {
 
191
        if ((mode == REBOOT) && force && args && *args) {
192
192
                mode = REBOOTCOMMAND;
193
193
                rebootcommand = *args;
194
194
        }