From a661b478127575459eb6182586790c146fd863d1 Mon Sep 17 00:00:00 2001 From: David P Date: Sat, 9 Mar 2019 15:01:47 -0300 Subject: [openrc-isos] Merge uefi-shell-v1-x86_64.conf and uefi-shell-v2-x86_64.conf into a single file Signed-off-by: David P --- configs/lxde-openrc/build.sh | 6 ++---- .../lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf | 3 --- .../lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf | 3 --- configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf | 6 ++++++ configs/lxde-openrc/efiboot/EFI/boot/refind.conf | 3 +-- configs/profile-openrc/build.sh | 6 ++---- .../efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf | 3 --- .../efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf | 3 --- .../profile-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf | 6 ++++++ configs/profile-openrc/efiboot/EFI/boot/refind.conf | 3 +-- 10 files changed, 18 insertions(+), 24 deletions(-) delete mode 100644 configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf delete mode 100644 configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf create mode 100644 configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf delete mode 100644 configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf delete mode 100644 configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf create mode 100644 configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf (limited to 'configs') diff --git a/configs/lxde-openrc/build.sh b/configs/lxde-openrc/build.sh index 6b4f88c..778de00 100755 --- a/configs/lxde-openrc/build.sh +++ b/configs/lxde-openrc/build.sh @@ -179,8 +179,7 @@ make_efi() { mkdir -p ${work_dir}/iso/EFI/boot/entries cp ${script_path}/efiboot/EFI/boot/refind.conf ${work_dir}/iso/EFI/boot/ - cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/EFI/boot/entries/ - cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/EFI/boot/entries/ + cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf ${work_dir}/iso/EFI/boot/entries/ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ @@ -222,8 +221,7 @@ make_efiboot() { mkdir -p ${work_dir}/efiboot/EFI/boot/entries cp ${script_path}/efiboot/EFI/boot/refind.conf ${work_dir}/efiboot/EFI/boot/ - cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/EFI/boot/entries/ - cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/EFI/boot/entries/ + cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf ${work_dir}/efiboot/EFI/boot/entries/ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ diff --git a/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf b/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf deleted file mode 100644 index c36229f..0000000 --- a/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf +++ /dev/null @@ -1,3 +0,0 @@ -menuentry "UEFI Shell x86_64 v1" { - loader /EFI/shellx64_v1.efi -} diff --git a/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf b/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf deleted file mode 100644 index a83bd8b..0000000 --- a/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf +++ /dev/null @@ -1,3 +0,0 @@ -menuentry "UEFI Shell x86_64 v2" { - loader /EFI/shellx64_v2.efi -} diff --git a/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf b/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf new file mode 100644 index 0000000..19e2164 --- /dev/null +++ b/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf @@ -0,0 +1,6 @@ +menuentry "UEFI Shell x86_64 v1" { + loader /EFI/shellx64_v1.efi +} +menuentry "UEFI Shell x86_64 v2" { + loader /EFI/shellx64_v2.efi +} diff --git a/configs/lxde-openrc/efiboot/EFI/boot/refind.conf b/configs/lxde-openrc/efiboot/EFI/boot/refind.conf index a99734b..6dba60c 100644 --- a/configs/lxde-openrc/efiboot/EFI/boot/refind.conf +++ b/configs/lxde-openrc/efiboot/EFI/boot/refind.conf @@ -3,7 +3,6 @@ textonly dont_scan_dirs /EFI/parabolaiso include entries/parabolaiso-x86_64.conf -include entries/uefi-shell-v1-x86_64.conf -include entries/uefi-shell-v2-x86_64.conf +include entries/uefi-shell-x86_64.conf default_selection "Parabola GNU/Linux-libre" diff --git a/configs/profile-openrc/build.sh b/configs/profile-openrc/build.sh index f183569..2663376 100755 --- a/configs/profile-openrc/build.sh +++ b/configs/profile-openrc/build.sh @@ -175,8 +175,7 @@ make_efi() { mkdir -p ${work_dir}/iso/EFI/boot/entries cp ${script_path}/efiboot/EFI/boot/refind.conf ${work_dir}/iso/EFI/boot/ - cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/EFI/boot/entries/ - cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/EFI/boot/entries/ + cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf ${work_dir}/iso/EFI/boot/entries/ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ @@ -218,8 +217,7 @@ make_efiboot() { mkdir -p ${work_dir}/efiboot/EFI/boot/entries cp ${script_path}/efiboot/EFI/boot/refind.conf ${work_dir}/efiboot/EFI/boot/ - cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot/EFI/boot/entries/ - cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot/EFI/boot/entries/ + cp ${script_path}/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf ${work_dir}/efiboot/EFI/boot/entries/ sed "s|%PARABOLAISO_LABEL%|${iso_label}|g; s|%INSTALL_DIR%|${install_dir}|g" \ diff --git a/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf b/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf deleted file mode 100644 index c36229f..0000000 --- a/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf +++ /dev/null @@ -1,3 +0,0 @@ -menuentry "UEFI Shell x86_64 v1" { - loader /EFI/shellx64_v1.efi -} diff --git a/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf b/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf deleted file mode 100644 index a83bd8b..0000000 --- a/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf +++ /dev/null @@ -1,3 +0,0 @@ -menuentry "UEFI Shell x86_64 v2" { - loader /EFI/shellx64_v2.efi -} diff --git a/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf b/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf new file mode 100644 index 0000000..19e2164 --- /dev/null +++ b/configs/profile-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf @@ -0,0 +1,6 @@ +menuentry "UEFI Shell x86_64 v1" { + loader /EFI/shellx64_v1.efi +} +menuentry "UEFI Shell x86_64 v2" { + loader /EFI/shellx64_v2.efi +} diff --git a/configs/profile-openrc/efiboot/EFI/boot/refind.conf b/configs/profile-openrc/efiboot/EFI/boot/refind.conf index a99734b..6dba60c 100644 --- a/configs/profile-openrc/efiboot/EFI/boot/refind.conf +++ b/configs/profile-openrc/efiboot/EFI/boot/refind.conf @@ -3,7 +3,6 @@ textonly dont_scan_dirs /EFI/parabolaiso include entries/parabolaiso-x86_64.conf -include entries/uefi-shell-v1-x86_64.conf -include entries/uefi-shell-v2-x86_64.conf +include entries/uefi-shell-x86_64.conf default_selection "Parabola GNU/Linux-libre" -- cgit v1.2.2