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

修改脚本,只有当磁盘未安装Grub的时候,才执行grub-install. 节省编译时间 (#408)

Browse Source
This commit is contained in:
LoGin 2023-10-24 14:19:26 +08:00 committed by GitHub
parent 46795849a2
commit 485e248761
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 34 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tools/write_disk_image.sh
View File

@ -14,12 +14,14 @@ ARCH="x86_64"
root_folder=$(dirname $(pwd)) root_folder=$(dirname $(pwd))
kernel="${root_folder}/bin/kernel/kernel.elf" kernel="${root_folder}/bin/kernel/kernel.elf"
boot_folder="${root_folder}/bin/disk_mount/boot" boot_folder="${root_folder}/bin/disk_mount/boot"
GRUB_INSTALL_PATH="${boot_folder}/grub"
mount_folder="${root_folder}/bin/disk_mount" mount_folder="${root_folder}/bin/disk_mount"
ARGS=`getopt -o p -l bios: -- "$@"` ARGS=`getopt -o p -l bios: -- "$@"`
eval set -- "${ARGS}" eval set -- "${ARGS}"
#echo formatted parameters=[$@] #echo formatted parameters=[$@]
echo "开始写入磁盘镜像..." echo "开始写入磁盘镜像..."
INSTALL_GRUB_TO_IMAGE="1"
# toolchain # toolchain
GRUB_ABS_PREFIX=/opt/dragonos-grub GRUB_ABS_PREFIX=/opt/dragonos-grub
@ -81,7 +83,16 @@ bash mount_virt_disk.sh || exit 1
LOOP_DEVICE=$(lsblk | grep disk_mount|sed 's/.*\(loop[0-9]*\)p1.*/\1/1g'|awk 'END{print $0}') LOOP_DEVICE=$(lsblk | grep disk_mount|sed 's/.*\(loop[0-9]*\)p1.*/\1/1g'|awk 'END{print $0}')
echo $LOOP_DEVICE echo $LOOP_DEVICE
mkdir -p ${boot_folder}/grub # mkdir -p ${GRUB_INSTALL_PATH}
# 检测grub文件夹是否存在
if [ -d "${GRUB_INSTALL_PATH}" ]; then
echo "grub已安装"
INSTALL_GRUB_TO_IMAGE="0"
else
mkdir -p ${GRUB_INSTALL_PATH}
fi
cp ${kernel} ${root_folder}/bin/disk_mount/boot cp ${kernel} ${root_folder}/bin/disk_mount/boot
# 拷贝用户程序到磁盘镜像 # 拷贝用户程序到磁盘镜像
mkdir -p ${root_folder}/bin/disk_mount/bin mkdir -p ${root_folder}/bin/disk_mount/bin
@ -107,6 +118,8 @@ cfg_content='set timeout=15
echo "echo '${cfg_content}' > ${boot_folder}/grub/grub.cfg" | sh echo "echo '${cfg_content}' > ${boot_folder}/grub/grub.cfg" | sh
fi fi
if [ "${INSTALL_GRUB_TO_IMAGE}" = "1" ];then
case "$1" in case "$1" in
--bios) --bios)
case "$2" in case "$2" in
@ -128,6 +141,7 @@ case "$1" in
;; ;;
esac esac
fi
sync sync
bash umount_virt_disk.sh bash umount_virt_disk.sh