From 4dc7496a983d3bf23586acb96024a5530a954377 Mon Sep 17 00:00:00 2001 From: Vic Yang Date: Thu, 2 Aug 2012 17:36:02 +0800 Subject: 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 Reviewed-by: Randall Spangler Commit-Ready: Vic Yang Tested-by: Vic Yang --- common/system_common.c | 10 +++++----- 1 file 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-"); -- cgit v1.2.1