Merge branch 'efi-plymouth' into dev

build.sh

@@ -901,15 +901,39 @@ make_efi() {
         cp "${airootfs_dir}/usr/lib/systemd/boot/efi/${__bootfile}" "${isofs_dir}/EFI/boot/${__bootfile#systemd-}"
     )
 
+    local _use_config_name
+    if [[ "${boot_splash}" = true ]]; then
+        _use_config_name="splash"
+    else
+        _use_config_name="nosplash"
+    fi
+
     mkdir -p "${isofs_dir}/loader/entries"
-    sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/loader/loader.conf" > "${isofs_dir}/loader/loader.conf"
+    sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/${_use_config_name}/loader.conf" > "${isofs_dir}/loader/loader.conf"
+
+    local _efi_config_list=() _efi_config
+    _efi_config_list+=(
+        $(
+            ls "${script_path}/efiboot/${_use_config_name}/archiso-usb"*".conf" | grep -v "rescue"
+        )
+    )
+
+    if [[ "${norescue_entry}" = false ]]; then
+        _efi_config_list+=(
+            $(
+                ls "${script_path}/efiboot/${_use_config_name}/archiso-usb"*".conf" | grep -v "rescue"
+            )
+        )
+    fi
 
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%OS_NAME%|${os_name}|g;
-         s|%KERNEL_FILENAME%|${kernel_filename}|g;
-         s|%ARCH%|${arch}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
-    "${script_path}/efiboot/loader/entries/archiso-usb.conf" > "${isofs_dir}/loader/entries/archiso-${arch}.conf"
+    for _efi_config in ${_efi_config_list[@]}; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+            s|%OS_NAME%|${os_name}|g;
+            s|%KERNEL_FILENAME%|${kernel_filename}|g;
+            s|%ARCH%|${arch}|g;
+            s|%INSTALL_DIR%|${install_dir}|g" \
+        "${_efi_config}" > "${isofs_dir}/loader/entries/$(basename "${_efi_config}" | sed "s|usb|${arch}|g")"
+    done
 
     # edk2-shell based UEFI shell
     local _efi_shell _efi_shell_arch
@@ -948,17 +972,41 @@ make_efiboot() {
         cp "${airootfs_dir}/usr/lib/systemd/boot/efi/${__bootfile}" "${work_dir}/efiboot/EFI/boot/${__bootfile#systemd-}"
     )
 
+    local _use_config_name
+    if [[ "${boot_splash}" = true ]]; then
+        _use_config_name="splash"
+    else
+        _use_config_name="nosplash"
+    fi
+
     mkdir -p "${work_dir}/efiboot/loader/entries"
-    sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/loader/loader.conf" > "${work_dir}/efiboot/loader/loader.conf"
+    sed "s|%ARCH%|${arch}|g;" "${script_path}/efiboot/${_use_config_name}/loader.conf" > "${work_dir}/efiboot/loader/loader.conf"
     cp "${isofs_dir}/loader/entries/uefi-shell"* "${work_dir}/efiboot/loader/entries/"
 
 
-    sed "s|%ARCHISO_LABEL%|${iso_label}|g;
-         s|%OS_NAME%|${os_name}|g;
-         s|%KERNEL_FILENAME%|${kernel_filename}|g;
-         s|%ARCH%|${arch}|g;
-         s|%INSTALL_DIR%|${install_dir}|g" \
-    "${script_path}/efiboot/loader/entries/archiso-cd.conf" > "${work_dir}/efiboot/loader/entries/archiso-${arch}.conf"
+    local _efi_config_list=() _efi_config
+    _efi_config_list+=(
+        $(
+            ls "${script_path}/efiboot/${_use_config_name}/archiso-cd"*".conf" | grep -v "rescue"
+        )
+    )
+
+    if [[ "${norescue_entry}" = false ]]; then
+        _efi_config_list+=(
+            $(
+                ls "${script_path}/efiboot/${_use_config_name}/archiso-cd"*".conf" | grep -v "rescue"
+            )
+        )
+    fi
+
+    for _efi_config in ${_efi_config_list[@]}; do
+        sed "s|%ARCHISO_LABEL%|${iso_label}|g;
+            s|%OS_NAME%|${os_name}|g;
+            s|%KERNEL_FILENAME%|${kernel_filename}|g;
+            s|%ARCH%|${arch}|g;
+            s|%INSTALL_DIR%|${install_dir}|g" \
+        "${_efi_config}" > "${work_dir}/efiboot/loader/entries/$(basename "${_efi_config}" | sed "s|cd|${arch}|g")"
+    done
 
     cp "${isofs_dir}/EFI/shell"*".efi" "${work_dir}/efiboot/EFI/"
 

efiboot/nosplash/archiso-cd-rescue-nogui.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI CD without GUI
+linux   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
+initrd  /EFI/alteriso/intel-ucode.img
+initrd  /EFI/alteriso/amd-ucode.img
+initrd  /EFI/alteriso/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset

efiboot/nosplash/archiso-cd-rescue-safegui.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI CD with safe graphics
+linux   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
+initrd  /EFI/alteriso/intel-ucode.img
+initrd  /EFI/alteriso/amd-ucode.img
+initrd  /EFI/alteriso/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset

efiboot/nosplash/archiso-usb-rescue-nogui.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI USB without GUI
+linux   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
+initrd  /%INSTALL_DIR%/boot/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset

efiboot/nosplash/archiso-usb-rescue-safegui.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI USB with safe graphics
+linux   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
+initrd  /%INSTALL_DIR%/boot/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset

efiboot/splash/archiso-cd-nosplash.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI CD without boot splash
+linux   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
+initrd  /EFI/alteriso/intel-ucode.img
+initrd  /EFI/alteriso/amd-ucode.img
+initrd  /EFI/alteriso/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

efiboot/splash/archiso-cd-rescue-nogui.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI CD without GUI
+linux   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
+initrd  /EFI/alteriso/intel-ucode.img
+initrd  /EFI/alteriso/amd-ucode.img
+initrd  /EFI/alteriso/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset

efiboot/splash/archiso-cd-rescue-safegui.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI CD with safe graphics
+linux   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
+initrd  /EFI/alteriso/intel-ucode.img
+initrd  /EFI/alteriso/amd-ucode.img
+initrd  /EFI/alteriso/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset

efiboot/splash/archiso-cd.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI CD
+linux   /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi
+initrd  /EFI/alteriso/intel-ucode.img
+initrd  /EFI/alteriso/amd-ucode.img
+initrd  /EFI/alteriso/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3

efiboot/splash/archiso-usb-nosplash.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI USB without boot splash
+linux   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
+initrd  /%INSTALL_DIR%/boot/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL%

efiboot/splash/archiso-usb-rescue-nogui.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI USB without GUI
+linux   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
+initrd  /%INSTALL_DIR%/boot/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset

efiboot/splash/archiso-usb-rescue-safegui.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI USB with safe graphics
+linux   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
+initrd  /%INSTALL_DIR%/boot/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset

efiboot/splash/archiso-usb.conf

@@ -0,0 +1,13 @@
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : [email protected]
+#
+# (c) 2019-2020 Fascode Network.
+#
+
+title   %OS_NAME% archiso %ARCH% UEFI USB
+linux   /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME%
+initrd  /%INSTALL_DIR%/boot/intel-ucode.img
+initrd  /%INSTALL_DIR%/boot/amd-ucode.img
+initrd  /%INSTALL_DIR%/boot/%ARCH%/archiso.img
+options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3

efiboot/splash/loader.conf

@@ -0,0 +1,2 @@
+timeout 5
+default archiso-%ARCH%.conf