mirror of
https://github.com/DragonOS-Community/DragonOS.git
synced 2025-06-20 10:06:31 +00:00
merge master
This commit is contained in:
@ -1 +1 @@
|
||||
v1.3
|
||||
v1.4
|
@ -232,6 +232,7 @@ rustInstall() {
|
||||
|
||||
echo "正在安装DragonOS所需的rust组件...首次安装需要一些时间来更新索引,请耐心等待..."
|
||||
cargo install cargo-binutils
|
||||
cargo install bpf-linker
|
||||
rustup toolchain install nightly-2023-08-15-x86_64-unknown-linux-gnu
|
||||
rustup toolchain install $RUST_VERSION-x86_64-unknown-linux-gnu
|
||||
rustup component add rust-src --toolchain $RUST_VERSION-x86_64-unknown-linux-gnu
|
||||
|
@ -126,9 +126,8 @@ cfg_content='set timeout=15
|
||||
set default=0
|
||||
insmod efi_gop
|
||||
menuentry "DragonOS" {
|
||||
multiboot2 /boot/kernel.elf "KERNEL_ELF"
|
||||
multiboot2 /boot/kernel.elf init=/bin/dragonreach
|
||||
}'
|
||||
|
||||
# 增加insmod efi_gop防止32位uefi启动报错
|
||||
echo "echo '${cfg_content}' > ${boot_folder}/grub/grub.cfg" | sh
|
||||
fi
|
||||
|
Reference in New Issue
Block a user