mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
add UEFI efilinux fixes
This commit is contained in:
parent
6a076ff9f0
commit
20e78fb596
3 changed files with 9 additions and 23 deletions
|
@ -238,9 +238,7 @@ GUMEOF
|
||||||
|
|
||||||
cat << GUMEOF > "${ALLINONE}/loader/entries/archboot-${_UEFI_ARCH}-lts-efilinux.conf"
|
cat << GUMEOF > "${ALLINONE}/loader/entries/archboot-${_UEFI_ARCH}-lts-efilinux.conf"
|
||||||
title Arch Linux LTS ${_UEFI_ARCH} Archboot via EFILINUX
|
title Arch Linux LTS ${_UEFI_ARCH} Archboot via EFILINUX
|
||||||
linux /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
efi /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
||||||
initrd /boot/initramfs_${_UEFI_ARCH}.img
|
|
||||||
options -f \\boot\\vmlinuz_${_UEFI_ARCH}_lts gpt loglevel=7 efivars.pstore_disable=1 efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap none=UEFI_ARCH_${_UEFI_ARCH}
|
|
||||||
GUMEOF
|
GUMEOF
|
||||||
|
|
||||||
cat << GUMEOF > "${ALLINONE}/loader/entries/uefi-shell-${_UEFI_ARCH}-v2.conf"
|
cat << GUMEOF > "${ALLINONE}/loader/entries/uefi-shell-${_UEFI_ARCH}-v2.conf"
|
||||||
|
@ -261,7 +259,7 @@ GUMEOF
|
||||||
mkdir -p "${ALLINONE}/EFI/efilinux"
|
mkdir -p "${ALLINONE}/EFI/efilinux"
|
||||||
cp -f "/usr/lib/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi" "${ALLINONE}/EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi"
|
cp -f "/usr/lib/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi" "${ALLINONE}/EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi"
|
||||||
|
|
||||||
cat << EOF > "${ALLINONE}/EFI/efilinux/efilinux_._cfg_"
|
cat << EOF > "${ALLINONE}/EFI/efilinux/efilinux.cfg"
|
||||||
-f \\boot\\vmlinuz_${_UEFI_ARCH}_lts gpt loglevel=7 efivars.pstore_disable=1 efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap none=UEFI_ARCH_${_UEFI_ARCH} initrd=\\boot\\initramfs_${_UEFI_ARCH}.img
|
-f \\boot\\vmlinuz_${_UEFI_ARCH}_lts gpt loglevel=7 efivars.pstore_disable=1 efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap none=UEFI_ARCH_${_UEFI_ARCH} initrd=\\boot\\initramfs_${_UEFI_ARCH}.img
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
@ -314,8 +312,6 @@ menuentry "Arch Linux ${_UEFI_ARCH} Archboot" {
|
||||||
menuentry "Arch Linux LTS ${_UEFI_ARCH} Archboot via EFILINUX" {
|
menuentry "Arch Linux LTS ${_UEFI_ARCH} Archboot via EFILINUX" {
|
||||||
icon /EFI/refind/icons/os_arch.icns
|
icon /EFI/refind/icons/os_arch.icns
|
||||||
loader /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
loader /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
||||||
initrd /boot/initramfs_${_UEFI_ARCH}.img
|
|
||||||
options "-f \\boot\\vmlinuz_${_UEFI_ARCH}_lts gpt loglevel=7 efivars.pstore_disable=1 efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap none=UEFI_ARCH_${_UEFI_ARCH}"
|
|
||||||
ostype Linux
|
ostype Linux
|
||||||
graphics off
|
graphics off
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
# Script for updating existing Archboot iso with newer UEFI shell, rEFInd, and /arch/setup script in the initramfs files
|
# Script for updating existing Archboot iso with newer UEFI shell, rEFInd, and /arch/setup script in the initramfs files
|
||||||
# Contributed by "Keshav P R" <the.ridikulus.rat aatt geemmayil ddoott ccoomm>
|
# Contributed by "Keshav Padram" <the ddoott ridikulus ddoott rat aatt geemmayil ddoott ccoomm>
|
||||||
|
|
||||||
[[ -z "${_REMOVE_i686}" ]] && _REMOVE_i686="0"
|
[[ -z "${_REMOVE_i686}" ]] && _REMOVE_i686="0"
|
||||||
[[ -z "${_REMOVE_x86_64}" ]] && _REMOVE_x86_64="0"
|
[[ -z "${_REMOVE_x86_64}" ]] && _REMOVE_x86_64="0"
|
||||||
|
@ -82,7 +82,7 @@ echo
|
||||||
|
|
||||||
## Extract the archboot iso using bsdtar
|
## Extract the archboot iso using bsdtar
|
||||||
bsdtar -C "${_ARCHBOOT_ISO_EXT_DIR}/" -xf "${_ARCHBOOT_ISO_OLD_PATH}"
|
bsdtar -C "${_ARCHBOOT_ISO_EXT_DIR}/" -xf "${_ARCHBOOT_ISO_OLD_PATH}"
|
||||||
# 7z x "${_ARCHBOOT_ISO_OLD_PATH}"
|
# 7z x -o "${_ARCHBOOT_ISO_EXT_DIR}/" "${_ARCHBOOT_ISO_OLD_PATH}"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
rm -rf "${_ARCHBOOT_ISO_EXT_DIR}/[BOOT]/" || true
|
rm -rf "${_ARCHBOOT_ISO_EXT_DIR}/[BOOT]/" || true
|
||||||
|
@ -316,9 +316,7 @@ GUMEOF
|
||||||
|
|
||||||
cat << GUMEOF > "${_ARCHBOOT_ISO_EXT_DIR}/loader/entries/archboot-${_UEFI_ARCH}-lts-efilinux.conf"
|
cat << GUMEOF > "${_ARCHBOOT_ISO_EXT_DIR}/loader/entries/archboot-${_UEFI_ARCH}-lts-efilinux.conf"
|
||||||
title Arch Linux LTS ${_UEFI_ARCH} Archboot via EFILINUX
|
title Arch Linux LTS ${_UEFI_ARCH} Archboot via EFILINUX
|
||||||
linux /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
efi /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
||||||
initrd /boot/initramfs_${_UEFI_ARCH}.img
|
|
||||||
options -f \\boot\\vmlinuz_${_UEFI_ARCH}_lts gpt loglevel=7 efivars.pstore_disable=1 efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap none=UEFI_ARCH_${_UEFI_ARCH}
|
|
||||||
GUMEOF
|
GUMEOF
|
||||||
|
|
||||||
cat << GUMEOF > "${_ARCHBOOT_ISO_EXT_DIR}/loader/entries/uefi-shell-${_UEFI_ARCH}-v2.conf"
|
cat << GUMEOF > "${_ARCHBOOT_ISO_EXT_DIR}/loader/entries/uefi-shell-${_UEFI_ARCH}-v2.conf"
|
||||||
|
@ -341,7 +339,7 @@ GUMEOF
|
||||||
cp -f "/usr/lib/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi" "${_ARCHBOOT_ISO_EXT_DIR}/EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi"
|
cp -f "/usr/lib/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi" "${_ARCHBOOT_ISO_EXT_DIR}/EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi"
|
||||||
echo
|
echo
|
||||||
|
|
||||||
cat << EOF > "${_ARCHBOOT_ISO_EXT_DIR}/EFI/efilinux/efilinux_._cfg_"
|
cat << EOF > "${_ARCHBOOT_ISO_EXT_DIR}/EFI/efilinux/efilinux.cfg"
|
||||||
-f \\boot\\vmlinuz_${_UEFI_ARCH}_lts gpt loglevel=7 efivars.pstore_disable=1 efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap none=UEFI_ARCH_${_UEFI_ARCH} initrd=\\boot\\initramfs_${_UEFI_ARCH}.img
|
-f \\boot\\vmlinuz_${_UEFI_ARCH}_lts gpt loglevel=7 efivars.pstore_disable=1 efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap none=UEFI_ARCH_${_UEFI_ARCH} initrd=\\boot\\initramfs_${_UEFI_ARCH}.img
|
||||||
EOF
|
EOF
|
||||||
echo
|
echo
|
||||||
|
@ -401,8 +399,6 @@ menuentry "Arch Linux ${_UEFI_ARCH} Archboot" {
|
||||||
menuentry "Arch Linux LTS ${_UEFI_ARCH} Archboot via EFILINUX" {
|
menuentry "Arch Linux LTS ${_UEFI_ARCH} Archboot via EFILINUX" {
|
||||||
icon /EFI/refind/icons/os_arch.icns
|
icon /EFI/refind/icons/os_arch.icns
|
||||||
loader /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
loader /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
||||||
initrd /boot/initramfs_${_UEFI_ARCH}.img
|
|
||||||
options "-f \\boot\\vmlinuz_${_UEFI_ARCH}_lts gpt loglevel=7 efivars.pstore_disable=1 efi_pstore.pstore_disable=1 efi_no_storage_paranoia add_efi_memmap none=UEFI_ARCH_${_UEFI_ARCH}"
|
|
||||||
ostype Linux
|
ostype Linux
|
||||||
graphics off
|
graphics off
|
||||||
}
|
}
|
||||||
|
|
|
@ -3721,19 +3721,14 @@ dogummiboot_uefi_common() {
|
||||||
PACKAGES=""
|
PACKAGES=""
|
||||||
|
|
||||||
if [[ "${_EFILINUX}" == "1" ]]; then
|
if [[ "${_EFILINUX}" == "1" ]]; then
|
||||||
cat << GUMEOF > "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-lts-main.conf"
|
cat << GUMEOF > "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-lts-efilinux.conf"
|
||||||
title Arch Linux LTS Kernel via EFILINUX
|
title Arch Linux LTS Kernel via EFILINUX
|
||||||
efi /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
efi /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
||||||
GUMEOF
|
|
||||||
|
|
||||||
cat << GUMEOF > "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-lts-fallback.conf"
|
|
||||||
title Arch Linux LTS Kernel via EFILINUX - Fallback Initramfs
|
|
||||||
efi /EFI/efilinux/efilinux${_SPEC_UEFI_ARCH}.efi
|
|
||||||
GUMEOF
|
GUMEOF
|
||||||
|
|
||||||
cat << GUMEOF > "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/loader.conf"
|
cat << GUMEOF > "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/loader.conf"
|
||||||
timeout 5
|
timeout 5
|
||||||
default archlinux-core-lts-main
|
default archlinux-core-lts-efilinux
|
||||||
GUMEOF
|
GUMEOF
|
||||||
|
|
||||||
else
|
else
|
||||||
|
@ -3784,8 +3779,7 @@ GUMEOF
|
||||||
geteditor || return 1
|
geteditor || return 1
|
||||||
|
|
||||||
if [[ "${_EFILINUX}" == "1" ]]; then
|
if [[ "${_EFILINUX}" == "1" ]]; then
|
||||||
"${EDITOR}" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-lts-main.conf"
|
"${EDITOR}" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-lts-efilinux.conf"
|
||||||
"${EDITOR}" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-lts-fallback.conf"
|
|
||||||
else
|
else
|
||||||
"${EDITOR}" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-main.conf"
|
"${EDITOR}" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-main.conf"
|
||||||
"${EDITOR}" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-fallback.conf"
|
"${EDITOR}" "${DESTDIR}/${UEFISYS_MOUNTPOINT}/loader/entries/archlinux-core-fallback.conf"
|
||||||
|
|
Loading…
Reference in a new issue