From 35b523c29ff480c5e50b6f28d80d930d0b83fe72 Mon Sep 17 00:00:00 2001 From: Ruiyu Ni Date: Fri, 7 Apr 2017 11:02:47 +0800 Subject: 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 Reviewed-by: Chen A Chen --- ShellPkg/Application/Shell/Shell.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'ShellPkg/Application') diff --git a/ShellPkg/Application/Shell/Shell.c b/ShellPkg/Application/Shell/Shell.c index e91b964d7b..4383298aab 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); -- cgit v1.2.3