napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change additionalInitrdFiles to an array

Browse Source
This commit is contained in:
dalto 2021-10-13 15:09:27 -05:00
parent 9d9cd44617
commit b5f8e30093
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/modules/bootloader/bootloader.conf
View File

@ -16,7 +16,9 @@ kernelName: "vmlinuz"
timeout: "10" timeout: "10"
# additionalInitrdFiles is a comma seperated list of file names # additionalInitrdFiles is a comma seperated list of file names
additionalInitrdFiles: "/boot/amd-ucode,/boot/intel-ucode" additionalInitrdFiles:
- "/boot/amd-ucode"
- "/boot/intel-ucode"
# Optionally set the menu entry name to use in systemd-boot. # Optionally set the menu entry name to use in systemd-boot.
# If not specified here, these settings will be taken from branding.desc. # If not specified here, these settings will be taken from branding.desc.

5
src/modules/bootloader/bootloader.schema.yaml
View File

@ -10,7 +10,10 @@ properties:
kernelSearchPath: { type: string } kernelSearchPath: { type: string }
kernelName: { type: string } kernelName: { type: string }
timeout: { type: string } # Inserted verbatim timeout: { type: string } # Inserted verbatim
additionalInitrdFiles: { type: string } additionalInitrdFiles:
type: array
items:
type: string
bootloaderEntryName: { type: string } bootloaderEntryName: { type: string }
kernelLine: { type: string } kernelLine: { type: string }
fallbackKernelLine: { type: string } fallbackKernelLine: { type: string }

2
src/modules/bootloader/main.py
View File

@ -168,7 +168,7 @@ def create_systemd_boot_conf(installation_root_path, efi_dir, uuid, entry, kerne
try: try:
additional_initrd_files = libcalamares.job.configuration["additionalInitrdFiles"] additional_initrd_files = libcalamares.job.configuration["additionalInitrdFiles"]
for initrd_file in additional_initrd_files.split(','): for initrd_file in additional_initrd_files:
libcalamares.utils.debug("Attempting to handle initrd image " + initrd_file) libcalamares.utils.debug("Attempting to handle initrd image " + initrd_file)
if os.path.isfile(os.path.join(installation_root_path, initrd_file.lstrip('/'))): if os.path.isfile(os.path.join(installation_root_path, initrd_file.lstrip('/'))):
libcalamares.utils.debug("Found image " + initrd_file) libcalamares.utils.debug("Found image " + initrd_file)