root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix space

Browse source
This commit is contained in:
Tobias Powalowski 2023-01-01 11:21:35 +01:00
parent 656690edb4
commit 03815da180
1 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
usr/lib/archboot/installer/bootloader.sh
View file

@ -372,7 +372,7 @@ do_efistub_copy_to_efisys() {
UEFISYS_PART_FS_UUID="$(getfsuuid "${_uefisysdev}")"
if [[ "${UEFISYS_MP}" == "/boot" ]]; then
if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
_KERNEL="/${VMLINUZ_EFISTUB}"
_KERNEL="/${VMLINUZ_EFISTUB}"
else
_KERNEL="/${VMLINUZ}"
if [[ "${RUNNING_ARCH}" == "x86_64" ]]; then
@ -386,14 +386,9 @@ do_efistub_copy_to_efisys() {
else
# name .efi for uefisys partition
if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
_UEFISYS_KERNEL="${VMLINUZ_EFISTUB}.efi"
_KERNEL="/${UEFISYS_PATH}/${VMLINUZ_EFISTUB}.efi"
else
_UEFISYS_KERNEL="${VMLINUZ}.efi"
fi
if [[ "${RUNNING_ARCH}" == "aarch64" ]]; then
_KERNEL="/${UEFISYS_PATH}/${VMLINUZ_EFISTUB}"
else
_KERNEL="/${UEFISYS_PATH}/${_UEFISYS_KERNEL}"
_KERNEL="/${UEFISYS_PATH}/${_VMLINUZ}.efi"
if [[ "${RUNNING_ARCH}" == "x86_64" ]]; then
_INITRD_INTEL_UCODE="/${UEFISYS_PATH}/${INTEL_UCODE}"
fi
@ -403,9 +398,9 @@ do_efistub_copy_to_efisys() {
fi
_INITRD="/${UEFISYS_PATH}/${INITRAMFS}"
! [[ -d "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}" ]] && mkdir -p "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}"
rm -f "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${_UEFISYS_KERNEL}"
rm -f "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${_KERNEL}"
rm -f "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${INITRAMFS}"
cp -f "${DESTDIR}/boot/${VMLINUZ}" "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${_UEFISYS_KERNEL}"
cp -f "${DESTDIR}/boot/${VMLINUZ}" "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${_KERNEL}"
cp -f "${DESTDIR}/boot/${INITRAMFS}" "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${INITRAMFS}"
cat << CONFEOF > "${DESTDIR}/etc/systemd/system/efistub_copy.path"
[Unit]
@ -428,7 +423,7 @@ CONFEOF
Description=Copy EFISTUB Kernel and Initramfs files to EFI SYSTEM PARTITION
[Service]
Type=oneshot
ExecStart=/usr/bin/cp -f /boot/${VMLINUZ} ${UEFISYS_MP}/${UEFISYS_PATH}/${_UEFISYS_KERNEL}
ExecStart=/usr/bin/cp -f /boot/${VMLINUZ} ${UEFISYS_MP}/${UEFISYS_PATH}/${_KERNEL}
ExecStart=/usr/bin/cp -f /boot/${INITRAMFS} ${UEFISYS_MP}/${UEFISYS_PATH}/${INITRAMFS}
CONFEOF
[[ "${RUNNING_ARCH}" == "aarch64" || "${RUNNING_ARCH}" == "x86_64" ]] && \
@ -457,8 +452,8 @@ do_efistub_uefi() {
if [[ "${UEFISYS_MP}" == "/boot" ]]; then
_CONTINUE="1"
else
if [[ -e "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${_UEFISYS_KERNEL}" ]] && [[ -e "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${INITRAMFS}" ]]; then
DIALOG --msgbox "The EFISTUB Kernel and initramfs have been copied to\n${UEFISYS_MP}/${UEFISYS_PATH}/${_UEFISYS_KERNEL} and\n${UEFISYS_MP}/${UEFISYS_PATH}/${INITRAMFS} respectively." 0 0
if [[ -e "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${_KERNEL}" ]] && [[ -e "${DESTDIR}/${UEFISYS_MP}/${UEFISYS_PATH}/${INITRAMFS}" ]]; then
DIALOG --msgbox "The EFISTUB Kernel and initramfs have been copied to\n${UEFISYS_MP}/${UEFISYS_PATH}/${_KERNEL} and\n${UEFISYS_MP}/${UEFISYS_PATH}/${INITRAMFS} respectively." 0 0
_CONTINUE="1"
else
DIALOG --msgbox "Error setting up EFISTUB kernel and initramfs in ${UEFISYS_MP}." 0 0