From 413fce72ec8c3889dc7d41778b2e2d95be678716 Mon Sep 17 00:00:00 2001
From: mofeng-git <mofeng654321@hotmail.com>
Date: Sat, 15 Mar 2025 12:51:23 +0000
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=95=9C=E5=83=8F=E6=9E=84?=
 =?UTF-8?q?=E5=BB=BA=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/build_img.sh | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/build/build_img.sh b/build/build_img.sh
index 84af7371..391efa28 100644
--- a/build/build_img.sh
+++ b/build/build_img.sh
@@ -25,7 +25,7 @@ BOOTFS=/tmp/bootfs
 ROOTFS=/tmp/rootfs
 OUTPUTDIR=/mnt/nas/src/output
 LOOPDEV=/dev/loop10
-DATE=240303
+DATE=240315
 export LC_ALL=C
 
 write_meta() {
@@ -115,8 +115,7 @@ onecloud_rootfs() {
 }
 
 cumebox2_rootfs() {
-    cp $SRCPATH/image/cumebox2/Armbian_24.8.1_Khadas-vim1_bookworm_current_6.6.47_minimal.img $SRCPATH/tmp/rootfs.img
-    dd if=/dev/zero of=/tmp/add.img bs=1M count=1500 && cat /tmp/add.img >> $SRCPATH/tmp/rootfs.img && rm /tmp/add.img
+    cp $SRCPATH/image/cumebox2/Armbian_25.2.2_Khadas-vim1_bookworm_current_6.12.17_minimal.img $SRCPATH/tmp/rootfs.img
     sudo parted -s $SRCPATH/tmp/rootfs.img resizepart 1 100% || exit -1
     sudo losetup --offset $((8192*512)) $LOOPDEV $SRCPATH/tmp/rootfs.img  || exit -1
     sudo e2fsck -f $LOOPDEV && sudo resize2fs $LOOPDEV
@@ -166,6 +165,7 @@ config_cumebox2_file() {
     sudo mkdir $ROOTFS/etc/oled
     sudo cp $SRCPATH/image/cumebox2/v-fix.dtb $ROOTFS/boot/dtb/amlogic/meson-gxl-s905x-khadas-vim.dtb
     sudo cp $SRCPATH/image/cumebox2/ssd $ROOTFS/usr/bin/
+	sudo chmod +x $ROOTFS/usr/bin/ssd
     sudo cp $SRCPATH/image/cumebox2/config.json $ROOTFS/etc/oled/config.json
 }
 
@@ -178,8 +178,8 @@ instal_one-kvm() {
     sudo chroot --userspec "root:root" $ROOTFS bash -c " \
         df -h \
         && apt-get update \
-        && apt install -y --no-install-recommends libxkbcommon-x11-0 nginx tesseract-ocr tesseract-ocr-eng tesseract-ocr-chi-sim iptables \
-        	curl kmod libmicrohttpd12 libjansson4 libssl3 libsofia-sip-ua0 libglib2.0-0 libopus0 libogg0 libcurl4 libconfig9 python3-pip \
+        && apt install -y --no-install-recommends libxkbcommon-x11-0 nginx tesseract-ocr tesseract-ocr-eng tesseract-ocr-chi-sim iptables network-manager \
+        	curl kmod libmicrohttpd12 libjansson4 libssl3 libsofia-sip-ua0 libglib2.0-0 libopus0 libogg0 libcurl4 libconfig9 python3-pip net-tools \
         && apt clean \
 		&& rm -rf /var/lib/apt/lists/* "
 
@@ -195,8 +195,6 @@ instal_one-kvm() {
         && pip3 cache purge \
 		&& rm -r /tmp/wheel "
 
-#pip3 install --target=/usr/lib/python3/dist-packages --break-system-packages pyfatfs -i https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple
-
     sudo chroot --userspec "root:root" $ROOTFS bash -c " \
         cd /One-KVM \
         && python3 setup.py install \