--- configs/releng/build.sh | 6 ++++++ .../efiboot/loader/entries/archiso-x86_64-speech-cd.conf | 6 ++++++ .../efiboot/loader/entries/archiso-x86_64-speech-usb.conf | 6 ++++++ configs/releng/efiboot/loader/loader.conf | 2 +- 4 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-speech-cd.conf create mode 100644 configs/releng/efiboot/loader/entries/archiso-x86_64-speech-usb.conf diff --git a/configs/releng/build.sh b/configs/releng/build.sh index 67cab58..d902e67 100755 --- a/configs/releng/build.sh +++ b/configs/releng/build.sh @@ -167,6 +167,9 @@ make_efi() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ ${script_path}/efiboot/loader/entries/archiso-x86_64-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64.conf + sed "s|%ARCHISO_LABEL%|${iso_label}|g; + s|%INSTALL_DIR%|${install_dir}|g" \ + ${script_path}/efiboot/loader/entries/archiso-x86_64-speech-usb.conf > ${work_dir}/iso/loader/entries/archiso-x86_64-speech.conf # EFI Shell 2.0 for UEFI 2.3+ curl -o ${work_dir}/iso/EFI/shellx64_v2.efi https://raw.githubusercontent.com/tianocore/edk2/UDK2018/ShellBinPkg/UefiShe... @@ -204,6 +207,9 @@ make_efiboot() { sed "s|%ARCHISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ ${script_path}/efiboot/loader/entries/archiso-x86_64-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64.conf + sed "s|%ARCHISO_LABEL%|${iso_label}|g; + s|%INSTALL_DIR%|${install_dir}|g" \ + ${script_path}/efiboot/loader/entries/archiso-x86_64-speech-cd.conf > ${work_dir}/efiboot/loader/entries/archiso-x86_64-speech.conf cp ${work_dir}/iso/EFI/shellx64_v2.efi ${work_dir}/efiboot/EFI/ cp ${work_dir}/iso/EFI/shellx64_v1.efi ${work_dir}/efiboot/EFI/ diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-cd.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-cd.conf new file mode 100644 index 0000000..7cfe90c --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-cd.conf @@ -0,0 +1,6 @@ +title speakup Arch Linux archiso x86_64 UEFI CD +linux /EFI/archiso/vmlinuz.efi +initrd /EFI/archiso/intel_ucode.img +initrd /EFI/archiso/amd_ucode.img +initrd /EFI/archiso/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% speakup.synth=soft diff --git a/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-usb.conf b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-usb.conf new file mode 100644 index 0000000..1ac83d8 --- /dev/null +++ b/configs/releng/efiboot/loader/entries/archiso-x86_64-speech-usb.conf @@ -0,0 +1,6 @@ +title speakup Arch Linux archiso x86_64 UEFI USB +linux /%INSTALL_DIR%/boot/x86_64/vmlinuz +initrd /%INSTALL_DIR%/boot/intel_ucode.img +initrd /%INSTALL_DIR%/boot/amd_ucode.img +initrd /%INSTALL_DIR%/boot/x86_64/archiso.img +options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% speakup.synth=soft diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index 62c4a83..39f105f 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,2 +1,2 @@ -timeout 3 +timeout 5 default archiso-x86_64 -- 2.23.0