Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
OpenCorePKG_MOD
提交
fa28cf92
O
OpenCorePKG_MOD
项目概览
btwise
/
OpenCorePKG_MOD
通知
26
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
OpenCorePKG_MOD
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
fa28cf92
编写于
2月 01, 2022
作者:
M
MikeBeaton
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OpenLinuxBoot: Fix crash if initrd but no vmlinuz files in autodetect dir
https://github.com/acidanthera/bugtracker/issues/1938
上级
9fe6ecb5
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
19 addition
and
7 deletion
+19
-7
Changelog.md
Changelog.md
+1
-0
Platform/OpenLinuxBoot/Autodetect.c
Platform/OpenLinuxBoot/Autodetect.c
+11
-7
Platform/OpenLinuxBoot/LinuxBootInternal.h
Platform/OpenLinuxBoot/LinuxBootInternal.h
+7
-0
未找到文件。
Changelog.md
浏览文件 @
fa28cf92
...
...
@@ -11,6 +11,7 @@ OpenCore Changelog
-
Added
`flags+=`
and
`flags-=`
arguments to OpenLinuxBoot to simplify setting driver flags if needed
-
Fixed OpenLinuxBoot entry name disambiguation when
`LINUX_BOOT_USE_LATEST`
flag is clear
-
Updated builtin firmware versions for SMBIOS and the rest
-
Fixed crash in OpenLinuxBoot with partly (re-)installed Linux distro
#### v0.7.7
-
Fixed rare crash caused by register corruption in the entry point
...
...
Platform/OpenLinuxBoot/Autodetect.c
浏览文件 @
fa28cf92
...
...
@@ -623,18 +623,13 @@ AutodetectBootOptions (
return
EFI_INVALID_PARAMETER
;
}
//
// Standard attached drives on OVMF appear as MBR, so it can be convenient when
// debugging to allow entries with incorrect (i.e. specifies no/every drive)
// root=... on NOOPT debugging build.
//
//#if !defined(OC_TARGET_NOOPT)
#if !defined(LINUX_ALLOW_MBR)
if
(
CompareGuid
(
&
gPartuuid
,
&
gEfiPartTypeUnusedGuid
))
{
Status
=
EFI_UNSUPPORTED
;
DEBUG
((
DEBUG_WARN
,
"LNX: Cannot autodetect root on MBR partition - %r
\n
"
,
Status
));
return
Status
;
}
//
#endif
#endif
//
// Insert "root=PARTUUID=..." option, followed by "ro" if requested, only if we get to here.
...
...
@@ -682,6 +677,8 @@ GenerateEntriesForVmlinuzFiles (
BOOLEAN
IsRescue
;
ASSERT
(
DirectoryPath
!=
NULL
);
ASSERT
(
mVmlinuzFiles
->
Count
>
0
);
DirectoryPathLength
=
StrLen
(
DirectoryPath
);
for
(
VmlinuzIndex
=
0
;
VmlinuzIndex
<
mVmlinuzFiles
->
Count
;
VmlinuzIndex
++
)
{
...
...
@@ -851,6 +848,13 @@ InternalAutodetectLinux (
//
if
(
!
EFI_ERROR
(
Status
))
{
Status
=
OcScanDirectory
(
VmlinuzDirectory
,
ProcessVmlinuzFile
,
NULL
);
if
(
!
EFI_ERROR
(
Status
)
&&
mVmlinuzFiles
->
Count
==
0
)
{
//
// If initrd files but no vmlinuz files are present in autodetect dir.
//
Status
=
EFI_NOT_FOUND
;
}
}
if
(
!
EFI_ERROR
(
Status
))
{
...
...
Platform/OpenLinuxBoot/LinuxBootInternal.h
浏览文件 @
fa28cf92
...
...
@@ -10,6 +10,13 @@
#define OC_TRACE_GRUB_VARS DEBUG_VERBOSE
#endif
/*
Standard attached drives on OVMF appear as MBR, so it can be convenient when
debugging to allow entries with incorrect (i.e. specifies no/every drive)
root=... .
*/
//#define LINUX_ALLOW_MBR
#include <Uefi.h>
#include <Library/OcBootManagementLib.h>
#include <Library/OcMiscLib.h>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录