A few corrections needed for Linux booting in some cases

This commit is contained in:
asava 2020-04-30 21:17:54 +03:00
parent 986c00552d
commit 1ec91d72cd
2 changed files with 4 additions and 3 deletions

View File

@ -1905,12 +1905,12 @@ FillinCustomEntry (
// } else {
// Entry->Options.SPrintf("%s", Prop->string);
// }
Entry->LoadOptions = Split<XStringArray>(Prop->string, " ");
Entry->LoadOptions.import(Split<XStringArray>(Prop->string, " "));
} else {
Prop = GetProperty(DictPointer, "Arguments");
if (Prop != NULL && (Prop->type == kTagTypeString)) {
// Entry->Options.SPrintf("%s", Prop->string);
Entry->LoadOptions = Split<XStringArray>(Prop->string, " ");
Entry->LoadOptions = Split<XStringArray>(Prop->string, " ");
Entry->Flags = OSFLAG_SET(Entry->Flags, OSFLAG_NODEFAULTARGS);
}
}
@ -2046,6 +2046,7 @@ FillinCustomEntry (
Entry->Type = OSTYPE_WINEFI;
} else if (AsciiStriCmp(Prop->string, "Linux") == 0) {
Entry->Type = OSTYPE_LIN;
Entry->Flags = OSFLAG_SET(Entry->Flags, OSFLAG_NODEFAULTARGS);
} else if (AsciiStriCmp(Prop->string, "LinuxKernel") == 0) {
Entry->Type = OSTYPE_LINEFI;
} else {

View File

@ -921,7 +921,7 @@ static VOID StartLoader(IN LOADER_ENTRY *Entry)
// DBG("BeginExternalScreen\n");
BeginExternalScreen(OSFLAG_ISSET(Entry->Flags, OSFLAG_USEGRAPHICS)/*, L"Booting OS"*/);
if (!OSTYPE_IS_WINDOWS(Entry->LoaderType)) {
if (!OSTYPE_IS_WINDOWS(Entry->LoaderType) && !OSTYPE_IS_LINUX(Entry->LoaderType)) {
if (OSFLAG_ISSET(Entry->Flags, OSFLAG_USEGRAPHICS)) {
// save orig OutputString and replace it with
// null implementation