DragonOS-Community/DragonOS
1
1
Fork 0
mirror of https://github.com/DragonOS-Community/DragonOS.git synced 2025-06-11 00:46:49 +00:00
Code Issues Releases Wiki Activity

修复bootstrap.sh未能自动更换gcc镜像源, 未能自动安装docker的问题 (#418)

Browse Source
This commit is contained in:
LoGin 2023-11-03 21:01:09 +08:00 committed by GitHub
parent d470019b1e
commit 8058ccb307
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/bootstrap.sh
View File

@ -48,7 +48,7 @@ install_ubuntu_debian_pkg()
if [ -z "$(which docker)" ] && [ -n ${dockerInstall} ]; then if [ -z "$(which docker)" ] && [ -n ${dockerInstall} ]; then
echo "正在安装docker..." echo "正在安装docker..."
sudo apt install docker.io docker-compose sudo apt install -y docker.io docker-compose
elif [ -z ${dockerInstall} ]; then elif [ -z ${dockerInstall} ]; then
echo "您传入--no-docker参数生效, 安装docker步骤被跳过." echo "您传入--no-docker参数生效, 安装docker步骤被跳过."
elif [ -n "$(which docker)" ]; then elif [ -n "$(which docker)" ]; then
@ -227,7 +227,7 @@ cargo install dadk || exit 1
# 创建磁盘镜像 # 创建磁盘镜像
bash create_hdd_image.sh bash create_hdd_image.sh
# 编译安装GCC交叉编译工具链 # 编译安装GCC交叉编译工具链
bash build_gcc_toolchain.sh bash build_gcc_toolchain.sh -cs
# 编译安装grub # 编译安装grub
bash grub_auto_install.sh bash grub_auto_install.sh