From 19a5573970e2413130687c871684501689bda794 Mon Sep 17 00:00:00 2001 From: Bjoern Anters Date: Tue, 7 Oct 2025 11:40:13 +0200 Subject: [PATCH 1/2] Squashed commit of the following: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit commit dbe1f8783d95514950cabe58d655ba74ee35e0b9 Merge: 35b7a74867 4d46bece4a Author: Bjoern Anters Date: Mon Jul 14 09:41:30 2025 +0200 Merge branch 'main' into 10996_get_default_nic commit 35b7a748670cf43edab1c5dc5923e6713acd9c6b Author: Bjoern Anters Date: Thu Jun 26 16:25:57 2025 +0200 use ip route structured data to retrieve default interface commit 234dfd374042a1628d6a934c073c58f0365843e9 Merge: a310b8022e 16c60c7528 Author: Björn Anters <57715217+mosys0815@users.noreply.github.com> Date: Tue Jun 24 17:51:37 2025 +0200 Merge branch 'apache:main' into 10996_get_default_nic commit a310b8022e32077a1d4b7543f662e8a12d890831 Author: Bjoern Anters Date: Mon Jun 23 16:40:10 2025 +0200 use ip route structured data to retrieve default interface commit 8e8549cca98ee14d8a108caa0266ce3fe6016161 Author: Bjoern Anters Date: Mon Jun 23 15:47:13 2025 +0200 Revert "make debian build vars work" This reverts commit c1ccb16969e56fef9929463b8834237eec30816c. commit 04466314fc018434691c2cd82137d5b3b9a4d6f5 Author: Bjoern Anters Date: Mon Jun 23 15:45:37 2025 +0200 Revert "use ip route structured data to retrieve default interface" This reverts commit 91578d7a0389e1df6f89f4fa402585680a5b58a0. commit c1ccb16969e56fef9929463b8834237eec30816c Author: Bjoern Anters Date: Tue Jun 17 12:06:44 2025 +0200 make debian build vars work commit 91578d7a0389e1df6f89f4fa402585680a5b58a0 Author: Bjoern Anters Date: Mon Jun 16 16:18:36 2025 +0200 use ip route structured data to retrieve default interface commit dbaeeda7bcc765c46b06b1d277263025b1971a86 Author: Bjoern Anters Date: Mon Jun 16 16:17:49 2025 +0200 use ip route structured data to retrieve default interface commit 44207cd1b3e60566b209bddb0ceb23a507ebe58f Author: Bjoern Anters Date: Mon Jun 16 16:15:33 2025 +0200 use ip route structured data to retrieve default interface commit c88a905f268aa7f5b851bf59139ebab1e8724e55 Author: Bjoern Anters Date: Mon Jun 16 16:12:13 2025 +0200 use ip route structured data to retrieve default interface commit 6200d66207ddeedfe18ee19ecfed6dc306b22b0e Author: Bjoern Anters Date: Mon Jun 16 16:07:40 2025 +0200 use ip route structured data to retrieve default interface commit e54772437f44624d9538f7169d7a93353a3303a6 Author: Bjoern Anters Date: Mon Jun 16 15:53:43 2025 +0200 use ip route structured data to retrieve default interface commit 9fb0150f4f1c4fe742211a3afb05cf80bf9705ea Author: Bjoern Anters Date: Tue Jun 10 17:23:45 2025 +0200 use ip route structured data to retrieve default interface --- utils/src/main/java/com/cloud/utils/net/NetUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java index 0e5834c4de9b..fbac14fc07e0 100644 --- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java +++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java @@ -306,7 +306,7 @@ public static String getDefaultEthDevice() { final String defDev = Script.runSimpleBashScript("/sbin/route -n get default 2> /dev/null | grep interface | awk '{print $2}'"); return defDev; } - return Script.runSimpleBashScript("ip route show default 0.0.0.0/0 | head -1 | awk '{print $5}'"); + return Script.runSimpleBashScript("/bin/ip -j a | /bin/jq -r '.[] | .addr_info | map(select(.local == \"'`/bin/ip -j r s default | /bin/jq -r '.[0] | .prefsrc'`'\")) | .[].label'"); } public static String getLocalIPString() { From 6b9c422f7945127046a929746c0f812174e8c899 Mon Sep 17 00:00:00 2001 From: Bjoern Anters Date: Wed, 8 Oct 2025 12:23:08 +0200 Subject: [PATCH 2/2] remove fullpath from ip and jq commands --- utils/src/main/java/com/cloud/utils/net/NetUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/src/main/java/com/cloud/utils/net/NetUtils.java b/utils/src/main/java/com/cloud/utils/net/NetUtils.java index fbac14fc07e0..96585e77da54 100644 --- a/utils/src/main/java/com/cloud/utils/net/NetUtils.java +++ b/utils/src/main/java/com/cloud/utils/net/NetUtils.java @@ -306,7 +306,7 @@ public static String getDefaultEthDevice() { final String defDev = Script.runSimpleBashScript("/sbin/route -n get default 2> /dev/null | grep interface | awk '{print $2}'"); return defDev; } - return Script.runSimpleBashScript("/bin/ip -j a | /bin/jq -r '.[] | .addr_info | map(select(.local == \"'`/bin/ip -j r s default | /bin/jq -r '.[0] | .prefsrc'`'\")) | .[].label'"); + return Script.runSimpleBashScript("ip -j a | jq -r '.[] | .addr_info | map(select(.local == \"'`ip -j r s default | jq -r '.[0] | .prefsrc'`'\")) | .[].label'"); } public static String getLocalIPString() {