mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-19 03:20:38 +02:00
fix limine 8.0 syntax change fixes issue #4
This commit is contained in:
parent
b1c5d41e49
commit
6937c1a5e1
1 changed files with 10 additions and 10 deletions
|
@ -12,16 +12,16 @@ _limine_common() {
|
||||||
_limine_config() {
|
_limine_config() {
|
||||||
_PARTN="$(${_LSBLK} PARTN "${_BOOTDEV}")"
|
_PARTN="$(${_LSBLK} PARTN "${_BOOTDEV}")"
|
||||||
cat << CONFEOF > "${_LIMINE_CONFIG}"
|
cat << CONFEOF > "${_LIMINE_CONFIG}"
|
||||||
TIMEOUT=5
|
timeout: 5
|
||||||
|
|
||||||
:Arch Linux
|
/Arch Linux
|
||||||
PROTOCOL=linux
|
protocol: linux
|
||||||
KERNEL_PATH=boot://${_PARTN}/${_VMLINUZ}
|
kernel_path: boot(${_PARTN}):/${_VMLINUZ}
|
||||||
CMDLINE=${_KERNEL_PARAMS_MOD}
|
cmdline: ${_KERNEL_PARAMS_MOD}
|
||||||
MODULE_PATH=boot://${_PARTN}/${_INITRAMFS}
|
module_path: boot(${_PARTN}):/${_INITRAMFS}
|
||||||
CONFEOF
|
CONFEOF
|
||||||
## Edit limine.cfg config file
|
## Edit limine.conf config file
|
||||||
_dialog --msgbox "You will now be put into the editor to edit:\nlimine.cfg\n\nAfter you save your changes, exit the editor." 8 50
|
_dialog --msgbox "You will now be put into the editor to edit:\nlimine.conf\n\nAfter you save your changes, exit the editor." 8 50
|
||||||
_geteditor || return 1
|
_geteditor || return 1
|
||||||
"${_EDITOR}" "${_LIMINE_CONFIG}"
|
"${_EDITOR}" "${_LIMINE_CONFIG}"
|
||||||
}
|
}
|
||||||
|
@ -36,7 +36,7 @@ _limine_bios() {
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
_dialog --no-mouse --infobox "Setting up LIMINE BIOS now..." 3 60
|
_dialog --no-mouse --infobox "Setting up LIMINE BIOS now..." 3 60
|
||||||
_LIMINE_CONFIG="${_DESTDIR}/boot/limine.cfg"
|
_LIMINE_CONFIG="${_DESTDIR}/boot/limine.conf"
|
||||||
_VMLINUZ="${_SUBDIR}/${_VMLINUZ}"
|
_VMLINUZ="${_SUBDIR}/${_VMLINUZ}"
|
||||||
_INITRAMFS="${_SUBDIR}/${_INITRAMFS}"
|
_INITRAMFS="${_SUBDIR}/${_INITRAMFS}"
|
||||||
_limine_config
|
_limine_config
|
||||||
|
@ -61,7 +61,7 @@ _limine_uefi() {
|
||||||
_dialog --no-mouse --infobox "Setting up LIMINE now..." 3 60
|
_dialog --no-mouse --infobox "Setting up LIMINE now..." 3 60
|
||||||
[[ -d "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/"
|
[[ -d "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/"
|
||||||
cp -f "${_DESTDIR}/usr/share/limine/BOOT${_UEFI_ARCH}.EFI" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI"
|
cp -f "${_DESTDIR}/usr/share/limine/BOOT${_UEFI_ARCH}.EFI" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI"
|
||||||
_LIMINE_CONFIG="${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/limine.cfg"
|
_LIMINE_CONFIG="${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/limine.conf"
|
||||||
_limine_config
|
_limine_config
|
||||||
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI" ]]; then
|
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI" ]]; then
|
||||||
_BOOTMGR_LABEL="LIMINE"
|
_BOOTMGR_LABEL="LIMINE"
|
||||||
|
|
Loading…
Reference in a new issue