mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
simplify grub config, move dtbs to kernel section, message fixup
This commit is contained in:
parent
2b735a08fd
commit
e7247251f6
2 changed files with 8 additions and 12 deletions
|
@ -65,6 +65,11 @@ _prepare_kernel_initramfs_files() {
|
||||||
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
||||||
install -m644 "${ALL_kver}" "${_ISODIR}/EFI/BOOT/VMLINUZ_X64"
|
install -m644 "${ALL_kver}" "${_ISODIR}/EFI/BOOT/VMLINUZ_X64"
|
||||||
fi
|
fi
|
||||||
|
# only aarch64
|
||||||
|
if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
|
||||||
|
echo "Prepare dtbs ..."
|
||||||
|
cp -r /boot/dtbs "${_ISODIR}/boot/"
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
### EFI status of RISCV64:
|
### EFI status of RISCV64:
|
||||||
|
@ -87,7 +92,6 @@ _prepare_kernel_initramfs_files_RISCV64() {
|
||||||
}
|
}
|
||||||
|
|
||||||
_prepare_ucode() {
|
_prepare_ucode() {
|
||||||
echo "Prepare ucode files ..."
|
|
||||||
# only x86_64
|
# only x86_64
|
||||||
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
if [[ "${_RUNNING_ARCH}" == "x86_64" ]]; then
|
||||||
echo "Prepare intel-ucode ..."
|
echo "Prepare intel-ucode ..."
|
||||||
|
@ -95,11 +99,6 @@ _prepare_ucode() {
|
||||||
mkdir -p "${_ISODIR}"/licenses/intel-ucode
|
mkdir -p "${_ISODIR}"/licenses/intel-ucode
|
||||||
cp /usr/share/licenses/intel-ucode/LICENSE "${_ISODIR}/licenses/intel-ucode"
|
cp /usr/share/licenses/intel-ucode/LICENSE "${_ISODIR}/licenses/intel-ucode"
|
||||||
fi
|
fi
|
||||||
# only aarch64
|
|
||||||
if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
|
|
||||||
echo "Prepare dtbs ..."
|
|
||||||
cp -r /boot/dtbs "${_ISODIR}/boot/"
|
|
||||||
fi
|
|
||||||
# both x86_64 and aarch64
|
# both x86_64 and aarch64
|
||||||
if ! [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
|
if ! [[ "${_RUNNING_ARCH}" == "riscv64" ]]; then
|
||||||
echo "Prepare amd-ucode ..."
|
echo "Prepare amd-ucode ..."
|
||||||
|
@ -134,7 +133,7 @@ _prepare_efitools_uefi () {
|
||||||
}
|
}
|
||||||
|
|
||||||
_prepare_uefi_shell_tianocore() {
|
_prepare_uefi_shell_tianocore() {
|
||||||
echo "Prepare uefi shells ..."
|
echo "Prepare uefi shell ..."
|
||||||
## Install Tianocore UDK/EDK2 EdkShellBinPkg UEFI X64 "Full Shell" - For UEFI Spec. <2.3 systems
|
## Install Tianocore UDK/EDK2 EdkShellBinPkg UEFI X64 "Full Shell" - For UEFI Spec. <2.3 systems
|
||||||
cp /usr/share/edk2-shell/x64/Shell_Full.efi "${_ISODIR}/EFI/TOOLS/SHELLX64.EFI"
|
cp /usr/share/edk2-shell/x64/Shell_Full.efi "${_ISODIR}/EFI/TOOLS/SHELLX64.EFI"
|
||||||
## Install Tianocore UDK/EDK2 ShellBinPkg UEFI IA32 "Full Shell" - For UEFI Spec. >=2.3 systems
|
## Install Tianocore UDK/EDK2 ShellBinPkg UEFI IA32 "Full Shell" - For UEFI Spec. >=2.3 systems
|
||||||
|
|
|
@ -19,7 +19,8 @@ insmod serial
|
||||||
serial --unit=0 --speed=115200
|
serial --unit=0 --speed=115200
|
||||||
if loadfont unicode ; then
|
if loadfont unicode ; then
|
||||||
insmod gfxterm
|
insmod gfxterm
|
||||||
set gfxmode="auto"
|
set gfxmode="1024x768,800x600,auto"
|
||||||
|
set gfxpayload="keep"
|
||||||
terminal_input console serial
|
terminal_input console serial
|
||||||
terminal_output gfxterm serial
|
terminal_output gfxterm serial
|
||||||
background_image /boot/grub/archboot-background.png
|
background_image /boot/grub/archboot-background.png
|
||||||
|
@ -77,7 +78,6 @@ if [ ${grub_platform} == "pc" ]; then
|
||||||
set default="Archboot Arch Linux X86_64 - BIOS Mode"
|
set default="Archboot Arch Linux X86_64 - BIOS Mode"
|
||||||
|
|
||||||
menuentry "Archboot Arch Linux x86_64 - BIOS Mode" {
|
menuentry "Archboot Arch Linux x86_64 - BIOS Mode" {
|
||||||
set gfxpayload=keep
|
|
||||||
_menu_running
|
_menu_running
|
||||||
linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0
|
linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0
|
||||||
_initrd_x86_64
|
_initrd_x86_64
|
||||||
|
@ -94,7 +94,6 @@ if [ ${grub_platform} == "efi" ]; then
|
||||||
set default="Archboot Arch Linux x86_64"
|
set default="Archboot Arch Linux x86_64"
|
||||||
|
|
||||||
menuentry "Archboot Arch Linux x86_64" {
|
menuentry "Archboot Arch Linux x86_64" {
|
||||||
set gfxpayload=keep
|
|
||||||
_menu_running
|
_menu_running
|
||||||
linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0
|
linux /boot/vmlinuz_x86_64 rootfstype=ramfs console=ttyS0,115200 console=tty0
|
||||||
_initrd_x86_64
|
_initrd_x86_64
|
||||||
|
@ -104,7 +103,6 @@ if [ ${grub_platform} == "efi" ]; then
|
||||||
set default="Archboot Arch Linux AA64"
|
set default="Archboot Arch Linux AA64"
|
||||||
|
|
||||||
menuentry "Archboot Arch Linux AA64" {
|
menuentry "Archboot Arch Linux AA64" {
|
||||||
set gfxpayload=keep
|
|
||||||
_menu_running
|
_menu_running
|
||||||
linux /boot/vmlinuz_aarch64 rootfstype=ramfs nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4
|
linux /boot/vmlinuz_aarch64 rootfstype=ramfs nr_cpus=1 console=ttyAMA0,115200 console=tty0 loglevel=4
|
||||||
_initrd_aarch64
|
_initrd_aarch64
|
||||||
|
@ -113,7 +111,6 @@ if [ ${grub_platform} == "efi" ]; then
|
||||||
set default="Archboot Arch Linux x86_64 - EFI MIXED MODE"
|
set default="Archboot Arch Linux x86_64 - EFI MIXED MODE"
|
||||||
|
|
||||||
menuentry "Archboot Arch Linux x86_64 - EFI MIXED MODE" {
|
menuentry "Archboot Arch Linux x86_64 - EFI MIXED MODE" {
|
||||||
set gfxpayload=keep
|
|
||||||
_menu_running
|
_menu_running
|
||||||
linux /boot/vmlinuz_x86_64 rootfstype=ramfs _IA32_UEFI=1 console=ttyS0,115200 console=tty0
|
linux /boot/vmlinuz_x86_64 rootfstype=ramfs _IA32_UEFI=1 console=ttyS0,115200 console=tty0
|
||||||
_initrd_x86_64
|
_initrd_x86_64
|
||||||
|
|
Loading…
Reference in a new issue