diff options
| author | David P <megver83@parabola.nu> | 2019-03-09 15:01:47 -0300 |
|---|---|---|
| committer | David P <megver83@parabola.nu> | 2019-03-09 15:04:16 -0300 |
| commit | a661b478127575459eb6182586790c146fd863d1 (patch) | |
| tree | e9136a3289a69b13725111411843bab89ca96727 /configs/lxde-openrc | |
| parent | a09ac8ebf2ecc46818f819a663981510571a2f27 (diff) | |
[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 <megver83@parabola.nu>
Diffstat (limited to 'configs/lxde-openrc')
| -rwxr-xr-x | configs/lxde-openrc/build.sh | 6 | ||||
| -rw-r--r-- | configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v2-x86_64.conf | 3 | ||||
| -rw-r--r-- | configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf (renamed from configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf) | 3 | ||||
| -rw-r--r-- | configs/lxde-openrc/efiboot/EFI/boot/refind.conf | 3 |
4 files changed, 6 insertions, 9 deletions
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-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-v1-x86_64.conf b/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf index c36229f..19e2164 100644 --- a/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-v1-x86_64.conf +++ b/configs/lxde-openrc/efiboot/EFI/boot/entries/uefi-shell-x86_64.conf @@ -1,3 +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" |