sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ShellPkg: disable startup script, show welcome banner

Browse Source 
Startup script does nothing other than confuse users.
Show a welcome banner and tell users how to exit.

Signed-off-by: Matt DeVillier <matt.devillier@gmail.com>
This commit is contained in:
Matt DeVillier
2020-04-22 17:54:38 -05:00
committed by Tim Crawford
parent 3fb944f925
commit b376a7d60f
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ShellPkg/Application/Shell/Shell.c
View File

@ -587,11 +587,16 @@ UefiMain (
ConInHandle = NULL; ConInHandle = NULL;
} }
if (!EFI_ERROR(Status) && PcdGet8(PcdShellSupportLevel) >= 1) { if (FALSE && !EFI_ERROR(Status) && PcdGet8(PcdShellSupportLevel) >= 1) {
// //
// process the startup script or launch the called app. // process the startup script or launch the called app.
// //
Status = DoStartupScript(ShellInfoObject.ImageDevPath, ShellInfoObject.FileDevPath); Status = DoStartupScript(ShellInfoObject.ImageDevPath, ShellInfoObject.FileDevPath);
} else {
//
// show welcome notice
//
ShellPrintHiiEx(-1, -1, NULL, STRING_TOKEN (STR_SHELL_WELCOME), ShellInfoObject.HiiHandle);
} }
if (!ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit && !ShellCommandGetExit() && (PcdGet8(PcdShellSupportLevel) >= 3 || PcdGetBool(PcdShellForceConsole)) && !EFI_ERROR(Status) && !ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoConsoleIn) { if (!ShellInfoObject.ShellInitSettings.BitUnion.Bits.Exit && !ShellCommandGetExit() && (PcdGet8(PcdShellSupportLevel) >= 3 || PcdGetBool(PcdShellForceConsole)) && !EFI_ERROR(Status) && !ShellInfoObject.ShellInitSettings.BitUnion.Bits.NoConsoleIn) {

1
ShellPkg/Application/Shell/Shell.uni
View File

@ -50,3 +50,4 @@
#string STR_SHELL_IMAGE_NOT_APP #language en-US "The image is not an application.\r\n" #string STR_SHELL_IMAGE_NOT_APP #language en-US "The image is not an application.\r\n"
#string STR_SHELL_WELCOME #language en-US "\r\nWelcome to the UEFI Shell!\r\n\r\nIf you wound up here by mistake, just type 'exit' to return to the UEFI Options Menu.\r\n\r\n"