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

readd add_efi_memmap to setup and grub.cfg

Browse source
This commit is contained in:
Tobias Powalowski 2022-02-02 17:09:05 +01:00
parent 13c77fe01d
commit f7daea8f39
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-setup.sh
View file

@ -2987,7 +2987,7 @@ bootloader_kernel_parameters() {
_KERNEL_PARAMS_COMMON_UNMOD="root=${_rootpart} rootfstype=${ROOTFS} rw ${ROOTFLAGS} ${RAIDARRAYS} ${CRYPTSETUP} cgroup_disable=memory" _KERNEL_PARAMS_COMMON_UNMOD="root=${_rootpart} rootfstype=${ROOTFS} rw ${ROOTFLAGS} ${RAIDARRAYS} ${CRYPTSETUP} cgroup_disable=memory"
# add uncommonn options here # add uncommonn options here
_KERNEL_PARAMS_BIOS_UNMOD="${_KERNEL_PARAMS_COMMON_UNMOD}" _KERNEL_PARAMS_BIOS_UNMOD="${_KERNEL_PARAMS_COMMON_UNMOD}"
_KERNEL_PARAMS_UEFI_UNMOD="${_KERNEL_PARAMS_COMMON_UNMOD}" _KERNEL_PARAMS_UEFI_UNMOD="${_KERNEL_PARAMS_COMMON_UNMOD} add_efi_memmap"
_KERNEL_PARAMS_BIOS_MOD="$(echo "${_KERNEL_PARAMS_BIOS_UNMOD}" | sed -e 's# # #g' | sed -e 's# # #g')" _KERNEL_PARAMS_BIOS_MOD="$(echo "${_KERNEL_PARAMS_BIOS_UNMOD}" | sed -e 's# # #g' | sed -e 's# # #g')"
_KERNEL_PARAMS_UEFI_MOD="$(echo "${_KERNEL_PARAMS_UEFI_UNMOD}" | sed -e 's# # #g' | sed -e 's# # #g')" _KERNEL_PARAMS_UEFI_MOD="$(echo "${_KERNEL_PARAMS_UEFI_UNMOD}" | sed -e 's# # #g' | sed -e 's# # #g')"

6
usr/share/archboot/grub/grub.cfg
View file

@ -54,7 +54,7 @@ if [ ${grub_platform} == "efi" ]; then
menuentry "Arch Linux AA64 Archboot" { menuentry "Arch Linux AA64 Archboot" {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --file /boot/vmlinuz_aarch64 search --no-floppy --set=root --file /boot/vmlinuz_aarch64
linux /boot/vmlinuz_aarch64 cgroup_disable=memory rootfstype=ramfs audit=0 nr_cpus=1 linux /boot/vmlinuz_aarch64 cgroup_disable=memory rootfstype=ramfs add_efi_memmap audit=0 nr_cpus=1
initrd /boot/amd-ucode.img /boot/initramfs_aarch64.img initrd /boot/amd-ucode.img /boot/initramfs_aarch64.img
} }
fi fi
@ -62,7 +62,7 @@ if [ ${grub_platform} == "efi" ]; then
menuentry "Arch Linux x86_64 Archboot" { menuentry "Arch Linux x86_64 Archboot" {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --file /boot/vmlinuz_x86_64 search --no-floppy --set=root --file /boot/vmlinuz_x86_64
linux /boot/vmlinuz_x86_64 cgroup_disable=memory rootfstype=ramfs linux /boot/vmlinuz_x86_64 cgroup_disable=memory rootfstype=ramfs add_efi_memmap
initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/initramfs_x86_64.img initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/initramfs_x86_64.img
} }
fi fi
@ -70,7 +70,7 @@ if [ ${grub_platform} == "efi" ]; then
menuentry "Arch Linux x86_64 Archboot - EFI MIXED MODE" { menuentry "Arch Linux x86_64 Archboot - EFI MIXED MODE" {
set gfxpayload=keep set gfxpayload=keep
search --no-floppy --set=root --file /boot/vmlinuz_x86_64 search --no-floppy --set=root --file /boot/vmlinuz_x86_64
linux /boot/vmlinuz_x86_64 cgroup_disable=memory _IA32_UEFI=1 rootfstype=ramfs linux /boot/vmlinuz_x86_64 cgroup_disable=memory _IA32_UEFI=1 rootfstype=ramfs add_efi_memmap
initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/initramfs_x86_64.img initrd /boot/intel-ucode.img /boot/amd-ucode.img /boot/initramfs_x86_64.img
} }
fi fi