Fix 'reboot' console command

BUG=chrome-os-partner:12155
TEST=Check 'reboot' command works with the following parameters:
       - No parameter
       - 'hard'
       - 'soft'
       - 'hard ap-off'
       - 'soft ap-off'
       - 'soft preserve'
       - 'hard ap-off preserve'

Change-Id: Ib54d6a0fe419ff7b47265698fae2fcd554f707d4
Reviewed-on: https://gerrit.chromium.org/gerrit/29017
Reviewed-by: Vincent Palatin <vpalatin@chromium.org>
Reviewed-by: Randall Spangler <rspangler@chromium.org>
Commit-Ready: Vic Yang <victoryang@chromium.org>
Tested-by: Vic Yang <victoryang@chromium.org>
This commit is contained in:
Vic Yang
2012-08-02 17:36:02 +08:00
committed by Gerrit
parent 985ff40583
commit 4dc7496a98

View File

@@ -693,18 +693,18 @@ static int command_reboot(int argc, char **argv)
if (!strcasecmp(argv[i], "hard") ||
!strcasecmp(argv[i], "cold")) {
flags |= SYSTEM_RESET_HARD;
} else if (!strcasecmp(argv[1], "soft")) {
} else if (!strcasecmp(argv[i], "soft")) {
flags &= ~SYSTEM_RESET_HARD;
} else if (!strcasecmp(argv[1], "ap-off")) {
} else if (!strcasecmp(argv[i], "ap-off")) {
flags |= SYSTEM_RESET_LEAVE_AP_OFF;
} else if (!strcasecmp(argv[1], "cancel")) {
} else if (!strcasecmp(argv[i], "cancel")) {
reboot_at_shutdown = EC_REBOOT_CANCEL;
return EC_SUCCESS;
} else if (!strcasecmp(argv[i], "preserve")) {
flags |= SYSTEM_RESET_PRESERVE_FLAGS;
} else
return EC_ERROR_PARAM1 + i - 1;
}
if (argc >= 3 && !strcasecmp(argv[2], "preserve"))
flags |= SYSTEM_RESET_PRESERVE_FLAGS;
if (flags & SYSTEM_RESET_HARD)
ccputs("Hard-");