Merge branch 'zsv-2@@2' into 'zsv_4.10.28'

gitlab · gitlab · commit 6a62586184e8 · 2026-01-27T02:04:17.000Z
&lt;fix&gt;[utils]: correct CPU model and MAC retrieval in license check

See merge request zstackio/zstack!9069
diff --git a/utils/src/main/java/org/zstack/utils/network/NetworkUtils.java b/utils/src/main/java/org/zstack/utils/network/NetworkUtils.java
@@ -532,7 +532,7 @@ public static List<String> getFreeIpv6InRange(String startIp, String endIp, List
     }
 
     public static List<String> getAllMac() {
-        ShellResult res = ShellUtils.runAndReturn("ip a | awk '/ether/ {print $2}' | sort -u");
+        ShellResult res = ShellUtils.runAndReturn("ip a | awk '/link\\// && !/loopback/ {print $2}' | sort -u");
 
         if (!res.isReturnCode(0)) {
             throw new RuntimeException("Fail to get mac address");

Original file line number	Diff line number	Diff line change
`@@ -532,7 +532,7 @@ public static List<String> getFreeIpv6InRange(String startIp, String endIp, List`
`532`	`532`	`}`
`533`	`533`
`534`	`534`	`public static List<String> getAllMac() {`
`535`		`- ShellResult res = ShellUtils.runAndReturn("ip a \| awk '/ether/ {print $2}' \| sort -u");`
	`535`	`+ ShellResult res = ShellUtils.runAndReturn("ip a \| awk '/link\\// && !/loopback/ {print $2}' \| sort -u");`
`536`	`536`
`537`	`537`	`if (!res.isReturnCode(0)) {`
`538`	`538`	`throw new RuntimeException("Fail to get mac address");`