[update] : EFI multiple kernels

diff --git a/build.sh b/build.sh
index 8abf87b..d904462 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -1252,8 +1252,9 @@ make_efi() {
     
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%OS_NAME%|${os_name}|g;
-    s|%INSTALL_DIR%|${install_dir}|g" \
-    "${script_path}/efiboot/loader/entries/usb/archiso-x86_64-usb-${kernel}.conf" > "${work_dir}/iso/loader/entries/archiso-x86_64.conf"
+         s|%KERNEL_FILENAME%|${kernel_filename}|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"
     
     # edk2-shell based UEFI shell
     cp /usr/share/edk2-shell/x64/Shell.efi ${work_dir}/iso/EFI/Shell_x64.efi
@@ -1293,8 +1294,9 @@ make_efiboot() {
     
     sed "s|%ARCHISO_LABEL%|${iso_label}|g;
          s|%OS_NAME%|${os_name}|g;
-    s|%INSTALL_DIR%|${install_dir}|g" \
-    "${script_path}/efiboot/loader/entries/cd/archiso-x86_64-cd-${kernel}.conf" > "${work_dir}/efiboot/loader/entries/archiso-x86_64.conf"
+         s|%KERNEL_FILENAME%|${kernel_filename}|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"
     
     cp "${work_dir}/iso/EFI/Shell_x64.efi" "${work_dir}/efiboot/EFI/"
     cp "${work_dir}/iso/EFI/Shell_Full_x64.efi" "${work_dir}/efiboot/EFI/"

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-ck.conf b/efiboot/loader/entries/archiso-x86_64-cd.conf
similarity index 88%
rename from efiboot/loader/entries/cd/archiso-x86_64-cd-ck.conf
rename to efiboot/loader/entries/archiso-x86_64-cd.conf
index c21d585..cd4153a 100644 (file)
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-ck.conf
+++ b/efiboot/loader/entries/archiso-x86_64-cd.conf
@@ -6,7 +6,7 @@
 #
 
 title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-ck.efi
+linux   /EFI/archiso/%KERNEL_FILENAME%.efi
 initrd  /EFI/archiso/intel_ucode.img
 initrd  /EFI/archiso/amd_ucode.img
 initrd  /EFI/archiso/archiso.img

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-ck.conf b/efiboot/loader/entries/archiso-x86_64-usb.conf
similarity index 86%
rename from efiboot/loader/entries/usb/archiso-x86_64-usb-ck.conf
rename to efiboot/loader/entries/archiso-x86_64-usb.conf
index 9f21ab0..7f3c538 100644 (file)
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-ck.conf
+++ b/efiboot/loader/entries/archiso-x86_64-usb.conf
@@ -6,7 +6,7 @@
 #
 
 title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-ck
+linux   /%INSTALL_DIR%/boot/x86_64/%KERNEL_FILENAME%
 initrd  /%INSTALL_DIR%/boot/intel_ucode.img
 initrd  /%INSTALL_DIR%/boot/amd_ucode.img
 initrd  /%INSTALL_DIR%/boot/x86_64/archiso.img

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-core.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-core.conf
deleted file mode 100644 (file)
index 23981af..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-core.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% 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%

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-lqx.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-lqx.conf
deleted file mode 100644 (file)
index 4d35c0b..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-lqx.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-lqx.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%

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-lts.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-lts.conf
deleted file mode 100644 (file)
index 1d57cac..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-lts.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-lts.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%

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-rt-lts.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-rt-lts.conf
deleted file mode 100644 (file)
index 1d57cac..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-rt-lts.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-lts.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%

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-rt.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-rt.conf
deleted file mode 100644 (file)
index 71cced9..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-rt.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-rt.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%

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-xanmod-lts.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-xanmod-lts.conf
deleted file mode 100644 (file)
index e85ec6c..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-xanmod-lts.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-xanmod-lts.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%

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-xanmod.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-xanmod.conf
deleted file mode 100644 (file)
index c92e5a3..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-xanmod.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-xanmod.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%

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-zen-letsnote.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-zen-letsnote.conf
deleted file mode 100644 (file)
index 85bc3b7..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-zen-letsnote.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-zen-letsnote.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%

diff --git a/efiboot/loader/entries/cd/archiso-x86_64-cd-zen.conf b/efiboot/loader/entries/cd/archiso-x86_64-cd-zen.conf
deleted file mode 100644 (file)
index 8428bd0..0000000
--- a/efiboot/loader/entries/cd/archiso-x86_64-cd-zen.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI CD
-linux   /EFI/archiso/vmlinuz-linux-zen.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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-core.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-core.conf
deleted file mode 100644 (file)
index 68c1f20..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-core.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% 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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-lqx.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-lqx.conf
deleted file mode 100644 (file)
index 1c50394..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-lqx.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lqx
-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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-lts.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-lts.conf
deleted file mode 100644 (file)
index 8db1fc0..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-lts.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts
-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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-rt-lts.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-rt-lts.conf
deleted file mode 100644 (file)
index 8db1fc0..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-rt-lts.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-lts
-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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-rt.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-rt.conf
deleted file mode 100644 (file)
index e36462c..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-rt.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-rt
-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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-xanmod-lts.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-xanmod-lts.conf
deleted file mode 100644 (file)
index 156bbb8..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-xanmod-lts.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-xanmod-lts
-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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-xanmod.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-xanmod.conf
deleted file mode 100644 (file)
index 93bec51..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-xanmod.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-xanmod
-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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-zen-letsnote.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-zen-letsnote.conf
deleted file mode 100644 (file)
index a11d3d2..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-zen-letsnote.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen-letsnote
-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%

diff --git a/efiboot/loader/entries/usb/archiso-x86_64-usb-zen.conf b/efiboot/loader/entries/usb/archiso-x86_64-usb-zen.conf
deleted file mode 100644 (file)
index f29ebea..0000000
--- a/efiboot/loader/entries/usb/archiso-x86_64-usb-zen.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# Yamada Hayao
-# Twitter: @Hayao0819
-# Email  : hayao@fascode.net
-#
-# (c) 2019-2020 Fascode Network.
-#
-
-title   %OS_NAME% archiso x86_64 UEFI USB
-linux   /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux-zen
-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%