diff options
| author | Vic Yang <victoryang@chromium.org> | 2012-08-02 17:36:02 +0800 |
|---|---|---|
| committer | Gerrit <chrome-bot@google.com> | 2012-08-02 19:41:58 -0700 |
| commit | 4dc7496a983d3bf23586acb96024a5530a954377 (patch) | |
| tree | 55a6d7defe221c392bc4a786d915a9955c2bc9f2 | |
| parent | 985ff40583c98aa151fedf0a2abd5d73da90b0b4 (diff) | |
| download | chrome-ec-4dc7496a983d3bf23586acb96024a5530a954377.tar.gz | |
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>
| -rw-r--r-- | common/system_common.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/common/system_common.c b/common/system_common.c index 4fe4c0c48e..9f62e39f64 100644 --- a/common/system_common.c +++ b/common/system_common.c @@ -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-"); |