From 2929a925a26c8edc8cabe8e803a4af12e6451c5e Mon Sep 17 00:00:00 2001
From: mofeng-git <mofeng654321@hotmail.com>
Date: Sun, 20 Oct 2024 11:01:22 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=8E=A9=E5=AE=A2=E4=BA=91=E6=9B=BF?=
 =?UTF-8?q?=E6=8D=A2=E7=BD=91=E7=BB=9C=E6=9C=8D=E5=8A=A1=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E4=B8=BA=20systemd-networkd=20=E4=BF=AE=E5=A4=8D=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=20mac=20=E5=9C=B0=E5=9D=80=E6=97=A0=E6=B3=95=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=8E=B7=E5=8F=96=20ip=20=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build/build_img.sh | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/build/build_img.sh b/build/build_img.sh
index 693d99a5..989bb860 100644
--- a/build/build_img.sh
+++ b/build/build_img.sh
@@ -5,7 +5,7 @@ BOOTFS=/tmp/bootfs
 ROOTFS=/tmp/rootfs
 OUTPUTDIR=/mnt/sda1/output
 LOOPDEV=/dev/loop10
-DATE=241004
+DATE=241018
 export LC_ALL=C
 
 write_meta() {
@@ -108,7 +108,7 @@ config_cumebox2_file() {
 }
 
 instal_one-kvm() {
-    #$1 arch;$2 "gpio" or "video1"
+    #$1 arch; $2 deivce: "gpio" or "video1"; $3 network: "systemd-networkd",default is network-manager
     sudo chroot --userspec "root:root" $ROOTFS bash -c " \
         df -h \
         && apt update \
@@ -122,14 +122,15 @@ instal_one-kvm() {
             python3-serial python3-zstandard python3-dbus-next \
         && apt install -y nginx python3-pip python3-dev python3-build net-tools tesseract-ocr tesseract-ocr-eng tesseract-ocr-chi-sim \
             git gpiod libxkbcommon0 build-essential janus-dev libssl-dev libffi-dev libevent-dev libjpeg-dev libbsd-dev libudev-dev \
-            pkg-config libx264-dev libyuv-dev libasound2-dev libsndfile-dev libspeexdsp-dev cpufrequtils iptables "
+            pkg-config libx264-dev libyuv-dev libasound2-dev libsndfile-dev libspeexdsp-dev cpufrequtils iptables network-manager \
+        && rm -rf /var/lib/apt/lists/* "
 
-    if [ "$1" = "armhf" ]; then 
+    if [ "$3" = "systemd-networkd" ]; then 
         sudo chroot --userspec "root:root" $ROOTFS bash -c " \
-            rm -rf /var/lib/apt/lists/* "
-    else
-        sudo chroot --userspec "root:root" $ROOTFS bash -c " \
-            apt install -y network-manager && rm -rf /var/lib/apt/lists/* "       
+            echo -e '[Match]\nName=eth0\n\n[Network]\nDHCP=yes\n\n[Link]\nMACAddress=B6:AE:B3:21:42:0C' > /etc/systemd/network/99-eth0.network \
+            && systemctl mask NetworkManager \
+            && systemctl unmask systemd-networkd \
+            && systemctl enable systemd-networkd systemd-resolved "        
     fi
     sudo chroot --userspec "root:root" $ROOTFS bash -c " \
         pip3 config set global.index-url https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple \
@@ -218,7 +219,7 @@ case $1 in
         onecloud_rootfs
         mount_rootfs
         config_file $1
-        instal_one-kvm armhf gpio
+        instal_one-kvm armhf gpio systemd-networkd
         write_meta $1
         umount_rootfs
         pack_img_onecloud