diff options
| author | Vic Yang <victoryang@chromium.org> | 2012-08-02 17:36:02 +0800 |
|---|---|---|
| committer | Vic Yang <victoryang@chromium.org> | 2012-08-03 08:07:32 -0700 |
| commit | 87a47b0e9b68ac0da6a73fd33f80dc04b9e85ac7 (patch) | |
| tree | 1ec0ff37cc1670847fe56e7c71ece7f908c21fc3 | |
| parent | 776374b028c3fe4708d8a1458c73805edb6895b1 (diff) | |
| download | chrome-ec-1.2.0.tar.gz | |
Fix 'reboot' console commandv1.2.0
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>
(cherry picked from commit 4dc7496a983d3bf23586acb96024a5530a954377)
Signed-off-by: Vic Yang <victoryang@chromium.org>
Change-Id: Ie7399c5bbdf62db02e201e7287b4cada3e439ccc
Reviewed-on: https://gerrit.chromium.org/gerrit/29141
Reviewed-by: Vincent Palatin <vpalatin@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 c9c6384975..b2ec25add1 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-"); |