From 84ff5e34098e593d22811fff46bffe53f6f714ce Mon Sep 17 00:00:00 2001 From: kokkiemouse Date: Wed, 18 Nov 2020 20:26:16 +0900 Subject: [PATCH] efi visible Signed-off-by: kokkiemouse --- efiboot/nosplash/archiso-cd-rescue-nogui.conf | 7 ++----- efiboot/nosplash/archiso-cd-rescue-safegui.conf | 7 ++----- efiboot/nosplash/archiso-cd.conf | 7 ++----- efiboot/nosplash/archiso-usb-rescue-nogui.conf | 7 ++----- efiboot/nosplash/archiso-usb-rescue-safegui.conf | 7 ++----- efiboot/nosplash/archiso-usb.conf | 7 ++----- efiboot/splash/archiso-cd-nosplash.conf | 7 ++----- efiboot/splash/archiso-cd-rescue-nogui.conf | 7 ++----- efiboot/splash/archiso-cd-rescue-safegui.conf | 7 ++----- efiboot/splash/archiso-cd.conf | 7 ++----- efiboot/splash/archiso-usb-nosplash.conf | 7 ++----- efiboot/splash/archiso-usb-rescue-nogui.conf | 7 ++----- efiboot/splash/archiso-usb-rescue-safegui.conf | 7 ++----- efiboot/splash/archiso-usb.conf | 7 ++----- 14 files changed, 28 insertions(+), 70 deletions(-) diff --git a/efiboot/nosplash/archiso-cd-rescue-nogui.conf b/efiboot/nosplash/archiso-cd-rescue-nogui.conf index 8ec82be6..8745fdce 100644 --- a/efiboot/nosplash/archiso-cd-rescue-nogui.conf +++ b/efiboot/nosplash/archiso-cd-rescue-nogui.conf @@ -6,8 +6,5 @@ # 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 +efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi +options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset diff --git a/efiboot/nosplash/archiso-cd-rescue-safegui.conf b/efiboot/nosplash/archiso-cd-rescue-safegui.conf index 9b42479a..6565dc01 100644 --- a/efiboot/nosplash/archiso-cd-rescue-safegui.conf +++ b/efiboot/nosplash/archiso-cd-rescue-safegui.conf @@ -6,8 +6,5 @@ # 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 +efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi +options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset diff --git a/efiboot/nosplash/archiso-cd.conf b/efiboot/nosplash/archiso-cd.conf index 9bbb1b5e..601fbe47 100644 --- a/efiboot/nosplash/archiso-cd.conf +++ b/efiboot/nosplash/archiso-cd.conf @@ -6,8 +6,5 @@ # 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% +efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi +options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/efiboot/nosplash/archiso-usb-rescue-nogui.conf b/efiboot/nosplash/archiso-usb-rescue-nogui.conf index 628820be..27afee78 100644 --- a/efiboot/nosplash/archiso-usb-rescue-nogui.conf +++ b/efiboot/nosplash/archiso-usb-rescue-nogui.conf @@ -6,8 +6,5 @@ # 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 +efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME% +options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset diff --git a/efiboot/nosplash/archiso-usb-rescue-safegui.conf b/efiboot/nosplash/archiso-usb-rescue-safegui.conf index 96a5c4f4..7f373da4 100644 --- a/efiboot/nosplash/archiso-usb-rescue-safegui.conf +++ b/efiboot/nosplash/archiso-usb-rescue-safegui.conf @@ -6,8 +6,5 @@ # 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 +efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME% +options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset diff --git a/efiboot/nosplash/archiso-usb.conf b/efiboot/nosplash/archiso-usb.conf index 3071fd9f..edf23ab4 100644 --- a/efiboot/nosplash/archiso-usb.conf +++ b/efiboot/nosplash/archiso-usb.conf @@ -6,8 +6,5 @@ # 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% +efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME% +options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/efiboot/splash/archiso-cd-nosplash.conf b/efiboot/splash/archiso-cd-nosplash.conf index 183c6e67..a5cfb251 100644 --- a/efiboot/splash/archiso-cd-nosplash.conf +++ b/efiboot/splash/archiso-cd-nosplash.conf @@ -6,8 +6,5 @@ # 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% +efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi +options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/efiboot/splash/archiso-cd-rescue-nogui.conf b/efiboot/splash/archiso-cd-rescue-nogui.conf index 8ec82be6..8745fdce 100644 --- a/efiboot/splash/archiso-cd-rescue-nogui.conf +++ b/efiboot/splash/archiso-cd-rescue-nogui.conf @@ -6,8 +6,5 @@ # 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 +efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi +options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset diff --git a/efiboot/splash/archiso-cd-rescue-safegui.conf b/efiboot/splash/archiso-cd-rescue-safegui.conf index 9b42479a..21e647a2 100644 --- a/efiboot/splash/archiso-cd-rescue-safegui.conf +++ b/efiboot/splash/archiso-cd-rescue-safegui.conf @@ -6,8 +6,5 @@ # 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 +efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi +options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset diff --git a/efiboot/splash/archiso-cd.conf b/efiboot/splash/archiso-cd.conf index e6620f4e..5a809ccd 100644 --- a/efiboot/splash/archiso-cd.conf +++ b/efiboot/splash/archiso-cd.conf @@ -6,8 +6,5 @@ # 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 +efi /EFI/alteriso/%ARCH%/%KERNEL_FILENAME%.efi +options initrd=/EFI/alteriso/intel-ucode.img initrd=/EFI/alteriso/amd-ucode.img initrd=/EFI/alteriso/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 diff --git a/efiboot/splash/archiso-usb-nosplash.conf b/efiboot/splash/archiso-usb-nosplash.conf index 276286d9..f304926e 100644 --- a/efiboot/splash/archiso-usb-nosplash.conf +++ b/efiboot/splash/archiso-usb-nosplash.conf @@ -6,8 +6,5 @@ # 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% +efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME% +options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% diff --git a/efiboot/splash/archiso-usb-rescue-nogui.conf b/efiboot/splash/archiso-usb-rescue-nogui.conf index 628820be..7feae136 100644 --- a/efiboot/splash/archiso-usb-rescue-nogui.conf +++ b/efiboot/splash/archiso-usb-rescue-nogui.conf @@ -6,8 +6,5 @@ # 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 +efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME% +options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% systemd.unit=multi-user.target nomodeset diff --git a/efiboot/splash/archiso-usb-rescue-safegui.conf b/efiboot/splash/archiso-usb-rescue-safegui.conf index 96a5c4f4..7f373da4 100644 --- a/efiboot/splash/archiso-usb-rescue-safegui.conf +++ b/efiboot/splash/archiso-usb-rescue-safegui.conf @@ -6,8 +6,5 @@ # 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 +efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME% +options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% nomodeset diff --git a/efiboot/splash/archiso-usb.conf b/efiboot/splash/archiso-usb.conf index ba948e48..a3e1febe 100644 --- a/efiboot/splash/archiso-usb.conf +++ b/efiboot/splash/archiso-usb.conf @@ -6,8 +6,5 @@ # 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 +efi /%INSTALL_DIR%/boot/%ARCH%/%KERNEL_FILENAME% +options initrd=/%INSTALL_DIR%/boot/intel-ucode.img initrd=/%INSTALL_DIR%/boot/amd-ucode.img initrd=/%INSTALL_DIR%/boot/%ARCH%/archiso.img archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% quiet splash loglevel=3 -- 2.11.0