From f2d5583a9428f576a09023032a3e3bae95690b9a Mon Sep 17 00:00:00 2001 From: David P Date: Wed, 15 Jul 2020 11:05:30 -0400 Subject: [releng][baseline] sync with archiso and archiso32 Signed-off-by: David P --- configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf | 2 +- configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf | 2 +- configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf | 2 -- configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf | 2 -- configs/releng/efiboot/loader/loader.conf | 2 +- 5 files changed, 3 insertions(+), 7 deletions(-) delete mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf delete mode 100644 configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf (limited to 'configs/releng/efiboot/loader') diff --git a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf index 057e14f..bbaa8f5 100644 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf +++ b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-cd.conf @@ -1,4 +1,4 @@ -title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI CD +title Parabola GNU/Linux-libre install medium (x86_64, UEFI) linux /EFI/parabolaiso/vmlinuz.efi initrd /EFI/parabolaiso/parabolaiso.img options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf index 3863799..cb8af3d 100644 --- a/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf +++ b/configs/releng/efiboot/loader/entries/parabolaiso-x86_64-usb.conf @@ -1,4 +1,4 @@ -title Parabola GNU/Linux-libre parabolaiso x86_64 UEFI USB +title Parabola GNU/Linux-libre install medium (x86_64, UEFI) linux /%INSTALL_DIR%/boot/x86_64/vmlinuz initrd /%INSTALL_DIR%/boot/x86_64/parabolaiso.img options parabolaisobasedir=%INSTALL_DIR% parabolaisolabel=%PARABOLAISO_LABEL% diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf deleted file mode 100644 index 9597ff2..0000000 --- a/configs/releng/efiboot/loader/entries/uefi-shell-v1-x86_64.conf +++ /dev/null @@ -1,2 +0,0 @@ -title UEFI Shell x86_64 v1 -efi /EFI/shellx64_v1.efi diff --git a/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf b/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf deleted file mode 100644 index 0dde77a..0000000 --- a/configs/releng/efiboot/loader/entries/uefi-shell-v2-x86_64.conf +++ /dev/null @@ -1,2 +0,0 @@ -title UEFI Shell x86_64 v2 -efi /EFI/shellx64_v2.efi diff --git a/configs/releng/efiboot/loader/loader.conf b/configs/releng/efiboot/loader/loader.conf index ba02c50..ea91d51 100644 --- a/configs/releng/efiboot/loader/loader.conf +++ b/configs/releng/efiboot/loader/loader.conf @@ -1,2 +1,2 @@ timeout 3 -default parabolaiso-x86_64 +default parabolaiso-x86_64.conf -- cgit v1.2.2