diff --git a/usr/lib/archboot/installer/bootloader_limine.sh b/usr/lib/archboot/installer/bootloader_limine.sh index a33f9bab3..1c58e0b5f 100644 --- a/usr/lib/archboot/installer/bootloader_limine.sh +++ b/usr/lib/archboot/installer/bootloader_limine.sh @@ -18,8 +18,8 @@ _limine_config() { PROTOCOL=linux KERNEL_PATH=boot://${_PARTN}/${_VMLINUZ} CMDLINE=${_KERNEL_PARAMS_MOD} + MODULE_PATH=boot://${_PARTN}/${_INITRAMFS} CONFEOF - echo "MODULE_PATH=boot://${_PARTN}/${_INITRAMFS}" >> "${_LIMINE_CONFIG}" ## Edit limine.cfg 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 _geteditor || return 1 diff --git a/usr/lib/archboot/installer/bootloader_systemd_bootd.sh b/usr/lib/archboot/installer/bootloader_systemd_bootd.sh index f518952d2..95ec71b0c 100644 --- a/usr/lib/archboot/installer/bootloader_systemd_bootd.sh +++ b/usr/lib/archboot/installer/bootloader_systemd_bootd.sh @@ -5,13 +5,15 @@ _systemd_boot_uefi() { _dialog --no-mouse --infobox "Setting up SYSTEMD-BOOT now..." 3 40 # create directory structure, if it doesn't exist [[ -d "${_DESTDIR}/boot/loader/entries" ]] || mkdir -p "${_DESTDIR}/boot/loader/entries" - cat << BOOTDEOF >> "${_DESTDIR}/boot/loader/entries/archlinux-core-main.conf" + _MAIN_CFG="boot/loader/entries/archlinux-core-main.conf" + _LOADER_CFG="boot/loader/loader.conf" + cat << BOOTDEOF >> "${_DESTDIR}/${_MAIN_CFG}" title Arch Linux linux /${_VMLINUZ} initrd /${_INITRAMFS} options ${_KERNEL_PARAMS_MOD} BOOTDEOF - cat << BOOTDEOF > "${_DESTDIR}/boot/loader/loader.conf" + cat << BOOTDEOF > "${_DESTDIR}/${_LOADER_CFG}" timeout 5 default archlinux-core-main BOOTDEOF @@ -37,8 +39,8 @@ BOOTDEOF sleep 2 _dialog --msgbox "You will now be put into the editor to edit:\nloader.conf and menu entry files\n\nAfter you save your changes, exit the editor." 8 50 _geteditor || return 1 - "${_EDITOR}" "${_DESTDIR}/boot/loader/entries/archlinux-core-main.conf" - "${_EDITOR}" "${_DESTDIR}/boot/loader/loader.conf" + "${_EDITOR}" "${_DESTDIR}/${_MAIN_CFG}" + "${_EDITOR}" "${_DESTDIR}/${_LOADER_CFG}" _pacman_hook_systemd_bootd _dialog --title " Success " --no-mouse --infobox "SYSTEMD-BOOT has been setup successfully." 3 50 sleep 3