Skip to content

Commit 443d934

Browse files
committed
Put Limine config and BIOS files in a limine/ subdir
1 parent aa44474 commit 443d934

1 file changed

Lines changed: 6 additions & 3 deletions

File tree

archinstall/lib/installer.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1244,6 +1244,9 @@ def _add_limine_bootloader(
12441244
limine_path = self.target / 'usr' / 'share' / 'limine'
12451245
hook_command = None
12461246

1247+
boot_limine_path = self.target / 'boot' / 'limine'
1248+
boot_limine_path.mkdir(parents=True, exist_ok=True)
1249+
12471250
if SysInfo.has_uefi():
12481251
if not efi_partition:
12491252
raise ValueError('Could not detect efi partition')
@@ -1273,7 +1276,7 @@ def _add_limine_bootloader(
12731276

12741277
try:
12751278
# The `limine-bios.sys` file contains stage 3 code.
1276-
shutil.copy(limine_path / 'limine-bios.sys', self.target / 'boot')
1279+
shutil.copy(limine_path / 'limine-bios.sys', boot_limine_path)
12771280

12781281
# `limine bios-install` deploys the stage 1 and 2 to the
12791282
SysCommand(f'arch-chroot {self.target} limine bios-install {parent_dev_path}', peek_output=True)
@@ -1282,7 +1285,7 @@ def _add_limine_bootloader(
12821285

12831286
hook_command = (
12841287
f'/usr/bin/limine bios-install {parent_dev_path}'
1285-
f' && /usr/bin/cp /usr/share/limine/limine-bios.sys /boot/'
1288+
f' && /usr/bin/cp /usr/share/limine/limine-bios.sys /boot/limine/'
12861289
)
12871290

12881291
hook_contents = f'''[Trigger]
@@ -1325,7 +1328,7 @@ def _add_limine_bootloader(
13251328
config_contents += f'\n/Arch Linux ({kernel}{variant})\n'
13261329
config_contents += '\n'.join([f' {it}' for it in entry]) + '\n'
13271330

1328-
config_path = self.target / 'boot' / 'limine.conf'
1331+
config_path = boot_limine_path / 'limine.conf'
13291332
config_path.write_text(config_contents)
13301333

13311334
self.helper_flags['bootloader'] = "limine"

0 commit comments

Comments
 (0)