mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
revert does not work
This commit is contained in:
parent
a6a414b9e0
commit
8aeacfff0c
1 changed files with 5 additions and 7 deletions
|
@ -432,9 +432,9 @@ _do_limine_uefi() {
|
||||||
_pacman_error
|
_pacman_error
|
||||||
fi
|
fi
|
||||||
_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/limine" ]] || mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/limine/"
|
[[ -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/limine/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/limine/limine.cfg"
|
_LIMINE_CONFIG="${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/limine.cfg"
|
||||||
cat << CONFEOF > "${_LIMINE_CONFIG}"
|
cat << CONFEOF > "${_LIMINE_CONFIG}"
|
||||||
TIMEOUT=5
|
TIMEOUT=5
|
||||||
|
|
||||||
|
@ -447,19 +447,17 @@ CONFEOF
|
||||||
echo "MODULE_PATH=boot:///${_INITRD_UCODE}" >> "${_LIMINE_CONFIG}"
|
echo "MODULE_PATH=boot:///${_INITRD_UCODE}" >> "${_LIMINE_CONFIG}"
|
||||||
fi
|
fi
|
||||||
echo "MODULE_PATH=boot:///${_INITRD}" >> "${_LIMINE_CONFIG}"
|
echo "MODULE_PATH=boot:///${_INITRD}" >> "${_LIMINE_CONFIG}"
|
||||||
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/limine/LIMINE${_UEFI_ARCH}.EFI" ]]; then
|
if [[ -e "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI" ]]; then
|
||||||
|
|
||||||
_BOOTMGR_LABEL="LIMINE"
|
_BOOTMGR_LABEL="LIMINE"
|
||||||
_BOOTMGR_LOADER_PATH="/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI"
|
_BOOTMGR_LOADER_PATH="/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI"
|
||||||
_do_uefi_bootmgr_setup
|
_do_uefi_bootmgr_setup
|
||||||
mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
|
mkdir -p "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT"
|
||||||
rm -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
rm -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
||||||
cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/limine/LIMINE${_UEFI_ARCH}.EFI" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
cp -f "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/LIMINE${_UEFI_ARCH}.EFI" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/BOOT${_UEFI_ARCH}.EFI"
|
||||||
sleep 2
|
sleep 2
|
||||||
_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.cfg\n\nAfter you save your changes, exit the editor." 8 50
|
||||||
_geteditor || return 1
|
_geteditor || return 1
|
||||||
"${_EDITOR}" "${_LIMINE_CONFIG}"
|
"${_EDITOR}" "${_LIMINE_CONFIG}"
|
||||||
cp -f "${_LIMINE_CONFIG}" "${_DESTDIR}/${_UEFISYS_MP}/EFI/BOOT/"
|
|
||||||
_do_efistub_copy_to_efisys | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Copying kernel, ucode and initramfs to EFI SYSTEM PARTITION now..." 6 75 0
|
_do_efistub_copy_to_efisys | _dialog --title " Logging to ${_VC} | ${_LOG} " --gauge "Copying kernel, ucode and initramfs to EFI SYSTEM PARTITION now..." 6 75 0
|
||||||
_dialog --title " Success " --no-mouse --infobox "LIMINE has been setup successfully." 3 50
|
_dialog --title " Success " --no-mouse --infobox "LIMINE has been setup successfully." 3 50
|
||||||
sleep 3
|
sleep 3
|
||||||
|
|
Loading…
Reference in a new issue