From f09a98329c4ec77010de86d126516310b407455a Mon Sep 17 00:00:00 2001
From: LoGin <longjin@DragonOS.org>
Date: Wed, 23 Aug 2023 16:09:29 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E5=A4=8Dbootstrap.sh=E5=9C=A8?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85libssl-dev=E4=B9=8B=E5=89=8D=EF=BC=8C?=
 =?UTF-8?q?=E5=AE=89=E8=A3=85dadk=EF=BC=8C=E4=BB=8E=E8=80=8C=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=20(#338)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1. 修复bootstrap.sh在安装libssl-dev之前，安装dadk，从而导致错误的问题
2. 构建系统的文档，补充对vnc端口的说明
---
 docs/introduction/build_system.md | 2 ++
 tools/bootstrap.sh                | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docs/introduction/build_system.md b/docs/introduction/build_system.md
index 57dff27d0..17962793a 100644
--- a/docs/introduction/build_system.md
+++ b/docs/introduction/build_system.md
@@ -241,4 +241,6 @@ make run-docker
 
 :::{note}
 如果您需要在vnc中运行DragonOS，请在上述命令后加上`-vnc`后缀。如：`make run-vnc`
+
+qemu虚拟机将在5900端口监听vnc连接。您可以使用vnc viewer或者Remmina连接至qemu虚拟机。
 :::
diff --git a/tools/bootstrap.sh b/tools/bootstrap.sh
index a6d7347a5..9667be242 100644
--- a/tools/bootstrap.sh
+++ b/tools/bootstrap.sh
@@ -142,7 +142,7 @@ rustInstall() {
 		rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu
         rustup component add llvm-tools-preview
 		rustup target add x86_64-unknown-none
-		cargo install dadk
+		
 		echo "Rust已经成功的在您的计算机上安装！请运行 source ~/.cargo/env 以使rust在当前窗口生效！"
 	fi
 }
@@ -206,6 +206,9 @@ else
 	fi
 fi
 
+# 安装dadk
+cargo install dadk || exit 1
+
 # 创建磁盘镜像
 bash create_hdd_image.sh
 # 编译安装GCC交叉编译工具链