system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-14 20:17:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Teach 60-ukify.install to search the staging dir

Browse source 
60-ukify.install would only work with initrd provided by command line
arguements. Fixed to look for both microcode and initrd is found in
$KERNEL_INSTALL_STAGING_AREA which is placed by initrd generator like
mkinitcpio
This commit is contained in:
Marc Pervaz Boocha 2023-07-30 22:35:39 +05:30 committed by Zbigniew Jędrzejewski-Szmek
parent 27edb18db0
commit f3d1d7609d
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/kernel-install/60-ukify.install.in
View file

@ -171,6 +171,14 @@ def kernel_cmdline(opts) -> str:
return ' ' + ' '.join(options)
def initrd_list(opts) -> list[Path]:
microcode = sorted(opts.staging_area.glob('microcode/*'))
initrd = sorted(opts.staging_area.glob('initrd*'))
#Order taken from 90-loaderentry.install
return [*microcode, *opts.initrd, *initrd]
def call_ukify(opts):
# Punish me harder.
# We want this:
@ -191,7 +199,7 @@ def call_ukify(opts):
opts2.config = config_file_location()
opts2.uname = opts.kernel_version
opts2.linux = opts.kernel_image
opts2.initrd = opts.initrd
opts2.initrd = initrd_list(opts)
# Note that 'uki.efi' is the name required by 90-uki-copy.install.
opts2.output = opts.staging_area / 'uki.efi'