From b66beefd4e9ead61ee55f335246ebeb8277d3011 Mon Sep 17 00:00:00 2001 From: login Date: Mon, 27 Feb 2023 01:00:35 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3ubuntu2210=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E6=AD=A3=E7=A1=AE=E7=BC=96=E8=AF=91grub?= =?UTF-8?q?=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=AD=A3=E7=A1=AE=E5=AE=89=E8=A3=85?= =?UTF-8?q?qemu=E7=9A=84=E9=97=AE=E9=A2=98=20(#176)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tools/bootstrap.sh | 2 +- tools/grub_auto_install.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/bootstrap.sh b/tools/bootstrap.sh index d32064ea..bac33b7a 100644 --- a/tools/bootstrap.sh +++ b/tools/bootstrap.sh @@ -59,7 +59,7 @@ install_ubuntu_debian_pkg() if [ -z "$(which qemu-system-x86_64)" ]; then echo "正在安装QEMU虚拟机..." - sudo $1 install -y qemu qemu-system qemu-kvm + sudo $1 install -y qemu-system qemu-kvm else echo "QEMU已经在您的电脑上安装！" fi diff --git a/tools/grub_auto_install.sh b/tools/grub_auto_install.sh index 7f69d156..1188a238 100644 --- a/tools/grub_auto_install.sh +++ b/tools/grub_auto_install.sh @@ -50,17 +50,17 @@ sudo apt-get install -y \ cd grub-2.06 echo "开始安装grub2.06" #编译安装三个版本的grub -./configure --target=i386 --prefix=${grub_dir_i386_legacy} || exit 1 +./configure --target=i386 --prefix=${grub_dir_i386_legacy} --disable-werror || exit 1 make -j $(nproc) || exit 1 sudo make install || exit 1 make clean || exit 1 -./configure --target=i386 --with-platform=efi --prefix=${grub_dir_i386_efi} || exit 1 +./configure --target=i386 --with-platform=efi --prefix=${grub_dir_i386_efi} --disable-werror || exit 1 make -j $(nproc) || exit 1 sudo make install || exit 1 make clean || exit 1 -./configure --target=x86_64 --with-platform=efi --prefix=${grub_dir_x86_64_efi} || exit 1 +./configure --target=x86_64 --with-platform=efi --prefix=${grub_dir_x86_64_efi} --disable-werror || exit 1 make -j $(nproc) || exit 1 sudo make install || exit 1