From 8058ccb307bbaf06a5810af32bcba3e41ab9fb93 Mon Sep 17 00:00:00 2001 From: LoGin Date: Fri, 3 Nov 2023 21:01:09 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbootstrap.sh=E6=9C=AA?= =?UTF-8?q?=E8=83=BD=E8=87=AA=E5=8A=A8=E6=9B=B4=E6=8D=A2gcc=E9=95=9C?= =?UTF-8?q?=E5=83=8F=E6=BA=90,=20=E6=9C=AA=E8=83=BD=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=AE=89=E8=A3=85docker=E7=9A=84=E9=97=AE=E9=A2=98=20(#418)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/bootstrap.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/bootstrap.sh b/tools/bootstrap.sh index 3dc26a93..7952dc8f 100644 --- a/tools/bootstrap.sh +++ b/tools/bootstrap.sh @@ -48,7 +48,7 @@ install_ubuntu_debian_pkg() if [ -z "$(which docker)" ] && [ -n ${dockerInstall} ]; then echo "正在安装docker..." - sudo apt install docker.io docker-compose + sudo apt install -y docker.io docker-compose elif [ -z ${dockerInstall} ]; then echo "您传入--no-docker参数生效, 安装docker步骤被跳过." elif [ -n "$(which docker)" ]; then @@ -227,7 +227,7 @@ cargo install dadk || exit 1 # 创建磁盘镜像 bash create_hdd_image.sh # 编译安装GCC交叉编译工具链 -bash build_gcc_toolchain.sh +bash build_gcc_toolchain.sh -cs # 编译安装grub bash grub_auto_install.sh