“修复网络脚本中的BUG”

yocto/meta-tvis-app/recipes/network-config-tvis/files/network-config.sh

@@ -25,13 +25,13 @@ if [ $STATUS = "up" ]; then
 
     # 判断是哪一张网卡
     if [ $INTERFACE = "eth0" ]; then
-        dhcp=`cat /etc/networkd-configuration/eth0.dhcp`
-        metric=`cat /etc/networkd-configuration/eth0.metric`
-        address=`cat /etc/networkd-configuration/eth0.address`
+        dhcp=`cat /etc/network-config/eth0.dhcp`
+        metric=`cat /etc/network-config/eth0.metric`
+        address=`cat /etc/network-config/eth0.address`
     elif [ $INTERFACE = "enP1p17s0" ]; then
-        dhcp=`cat /etc/networkd-configuration/enP1p17s0.dhcp`
-        metric=`cat /etc/networkd-configuration/enP1p17s0.metric`
-        address=`cat /etc/networkd-configuration/enP1p17s0.address`
+        dhcp=`cat /etc/network-config/enP1p17s0.dhcp`
+        metric=`cat /etc/network-config/enP1p17s0.metric`
+        address=`cat /etc/network-config/enP1p17s0.address`
     fi
 
     gateway=${address/${address##*.}/"1"}
@@ -66,7 +66,7 @@ if [ $STATUS = "up" ]; then
             # 检查 ipv4.address 配置是否一致，不一致需要重新设置并重启网卡
             str1=`nmcli connection show $INTERFACE | grep ipv4.method`
             str2=`nmcli connection show $INTERFACE | grep ipv4.addresses`
-            if [${str1##*:} != "manual" ] || [${str2##*:} != $address ]; then
+            if [${str1##*:} != "manual" ] || [${str2##*:} != "$address/24" ]; then
                 nmcli connection modify $INTERFACE ipv4.addresses $address/24 ipv4.gateway $gateway ipv4.dns $gateway ipv4.method manual
                 echo "nmcli connection modify $INTERFACE ipv4.addresses $address/24 ipv4.gateway $gateway ipv4.dns $gateway ipv4.method manual"
                 # 启动网卡

yocto/meta-tvis-app/recipes/network-config-tvis/network-config-tvis.bb

@@ -3,8 +3,8 @@ SECTION = "network-configuration-tvis"
 DEPENDS = ""
 LICENSE = "CLOSED"
 
-SRC_URI += "file://networkd-configuration"
-SRC_URI += "file://networkd-configuration.sh"
+SRC_URI += "file://network-config"
+SRC_URI += "file://network-config.sh"
 
 S = "${WORKDIR}"
 
@@ -14,11 +14,11 @@ do_compile[noexec] = "1"
 do_package_qa[noexec] = "1"
 
 do_install() {
-    install -d ${D}/etc/networkd-configuration
-    cp -rf ${WORKDIR}/networkd-configuration/* ${D}/etc/networkd-configuration/
+    install -d ${D}/etc/network-config
+    cp -rf ${WORKDIR}/network-config/* ${D}/etc/network-config/
 
     install -d ${D}/etc/NetworkManager/dispatcher.d/
-    install -m 0755 ${WORKDIR}/networkd-configuration.sh -D ${D}/etc/NetworkManager/dispatcher.d/10-networkd-configuration.sh
+    install -m 0755 ${WORKDIR}/network-config.sh -D ${D}/etc/NetworkManager/dispatcher.d/10-network-config.sh
 }
 
 FILES_${PN} += "/etc/*"

yocto/meta-tvis-app/recipes/packagegroups/packagegroup-tvis-app.bb

@@ -10,6 +10,6 @@ RDEPENDS:${PN} = "\
         motovis-tvis \
         netcore-tvis \
         opencv-tvis \
-        networkd-configuration-tvis \
+        network-config-tvis \
         rtsp-server-tvis \
         "