diff options
| author | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-04-07 11:02:47 +0800 |
|---|---|---|
| committer | Ruiyu Ni <ruiyu.ni@intel.com> | 2017-04-07 11:06:12 +0800 |
| commit | 35b523c29ff480c5e50b6f28d80d930d0b83fe72 (patch) | |
| tree | 3f520abc96beecfc50dbf7c50afa9baae5fdb56e /ShellPkg/Application | |
| parent | 08eff917888fe4cb751fade30ddbb4618117aeed (diff) | |
| download | edk2-35b523c29ff480c5e50b6f28d80d930d0b83fe72.zip edk2-35b523c29ff480c5e50b6f28d80d930d0b83fe72.tar.gz edk2-35b523c29ff480c5e50b6f28d80d930d0b83fe72.tar.bz2 | |
ShellPkg: Fix Shell to not return without startup.nsh after timeout
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>
Reviewed-by: Chen A Chen <chen.a.chen@intel.com>
Diffstat (limited to 'ShellPkg/Application')
| -rw-r--r-- | ShellPkg/Application/Shell/Shell.c | 5 |
1 files changed, 5 insertions, 0 deletions
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);
|