Re: [PATCH] ShellPkg: Fix Shell to not return without startup.nsh after timeout

["Carsey, Jaben" <jaben.carsey@intel.com>]

Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>

> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Ruiyu Ni
> Sent: Thursday, April 06, 2017 8:04 PM
> To: edk2-devel@lists.01.org
> Cc: Chen, Chen A <chen.a.chen@intel.com>
> Subject: [edk2] [PATCH] ShellPkg: Fix Shell to not return without startup.nsh
> after timeout
> Importance: High
> 
> 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
> 
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel