From b5f8e30093879bec84b3cd0555e8b0f785f2d1db Mon Sep 17 00:00:00 2001
From: dalto <dalto@fastmail.com>
Date: Wed, 13 Oct 2021 15:09:27 -0500
Subject: [PATCH] Change additionalInitrdFiles to an array

---
 src/modules/bootloader/bootloader.conf        | 4 +++-
 src/modules/bootloader/bootloader.schema.yaml | 5 ++++-
 src/modules/bootloader/main.py                | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/modules/bootloader/bootloader.conf b/src/modules/bootloader/bootloader.conf
index 278c345ad..60235e5d2 100644
--- a/src/modules/bootloader/bootloader.conf
+++ b/src/modules/bootloader/bootloader.conf
@@ -16,7 +16,9 @@ kernelName: "vmlinuz"
 timeout: "10"
 
 # 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.
 # If not specified here, these settings will be taken from branding.desc.
diff --git a/src/modules/bootloader/bootloader.schema.yaml b/src/modules/bootloader/bootloader.schema.yaml
index 914a17c27..0849f6865 100644
--- a/src/modules/bootloader/bootloader.schema.yaml
+++ b/src/modules/bootloader/bootloader.schema.yaml
@@ -10,7 +10,10 @@ properties:
     kernelSearchPath:  { type: string }
     kernelName:  { type: string }
     timeout:  { type: string }  # Inserted verbatim
-    additionalInitrdFiles:  { type: string }
+    additionalInitrdFiles:
+        type: array
+        items:
+            type: string
     bootloaderEntryName:  { type: string }
     kernelLine:  { type: string }
     fallbackKernelLine:  { type: string }
diff --git a/src/modules/bootloader/main.py b/src/modules/bootloader/main.py
index 7c5007050..bcb7f230a 100644
--- a/src/modules/bootloader/main.py
+++ b/src/modules/bootloader/main.py
@@ -168,7 +168,7 @@ def create_systemd_boot_conf(installation_root_path, efi_dir, uuid, entry, kerne
 
     try:
         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)
             if os.path.isfile(os.path.join(installation_root_path, initrd_file.lstrip('/'))):
                 libcalamares.utils.debug("Found image " + initrd_file)