From: Ruiyu Ni <ruiyu.ni@intel.com>
To: edk2-devel@lists.01.org
Cc: Chen A Chen <chen.a.chen@intel.com>
Subject: [PATCH] ShellPkg: Fix Shell to not return without startup.nsh after timeout
Date: Fri, 7 Apr 2017 11:03:41 +0800 [thread overview]
Message-ID: <20170407030341.245636-1-ruiyu.ni@intel.com> (raw)
When user doesn't press key to exit the timeout waiting in Shell,
and there is no startup.nsh, Shell exits with failure status.
aaf51f08ee104447207bba571649556095befc93 introduced this bug.
The patch fixes this issue.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ruiyu Ni <ruiyu.ni@intel.com>
Cc: Chen A Chen <chen.a.chen@intel.com>
---
ShellPkg/Application/Shell/Shell.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c
index e91b964..4383298 100644
--- a/ShellPkg/Application/Shell/Shell.c
+++ b/ShellPkg/Application/Shell/Shell.c
@@ -1279,6 +1279,11 @@ DoStartupScript(
if (FileStringPath != NULL) {
Status = RunScriptFile (FileStringPath, NULL, L"", ShellInfoObject.NewShellParametersProtocol);
FreePool (FileStringPath);
+ } else {
+ //
+ // we return success since startup script is not mandatory.
+ //
+ Status = EFI_SUCCESS;
}
return (Status);
--
2.9.0.windows.1
next reply other threads:[~2017-04-07 3:03 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-07 3:03 Ruiyu Ni [this message]
2017-04-07 15:22 ` [PATCH] ShellPkg: Fix Shell to not return without startup.nsh after timeout Carsey, Jaben
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170407030341.245636-1-ruiyu.ni@intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox