StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: put EFI boot entry of recovery partition last of boot order

This commit is contained in:
Yao Wei (魏銘廷) 2023-08-14 17:46:13 +08:00
parent 3716f1259f
commit e0e2515eb5
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
subiquity/server/controllers/install.py
View File

@ -557,7 +557,7 @@ class InstallController(SubiquityController):
cmd = [ cmd = [
"efibootmgr", "efibootmgr",
"--bootorder", "--bootorder",
",".join(efi_state_before.order), ",".join(efi_state_before.order + [new_bootnum]),
] ]
rp_bootnum = new_bootnum rp_bootnum = new_bootnum
await self.app.command_runner.run(cmd) await self.app.command_runner.run(cmd)

11
subiquity/server/controllers/tests/test_install.py
View File

@ -264,7 +264,7 @@ class TestInstallController(unittest.IsolatedAsyncioTestCase):
[ [
"efibootmgr", "efibootmgr",
"--bootorder", "--bootorder",
"0000,0002", "0000,0002,0003",
] ]
), ),
] ]
@ -295,7 +295,14 @@ class TestInstallController(unittest.IsolatedAsyncioTestCase):
[ [
"efibootmgr", "efibootmgr",
"--bootorder", "--bootorder",
"0000,0002", "0000,0002,0003",
]
),
call(
[
"efibootmgr",
"--bootnext",
"0003",
] ]
), ),
] ]