From: Daniel P. Berrangé <berrange@redhat.com>
Date: Mon, 28 Apr 2025 10:47:34 +0000 (+0100)
Subject: util: stop hardcoding 'ifconfig' path
X-Git-Tag: v11.4.0-rc1~131
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6bfead9893689bb90b10f13689f10a77cdca4e53;p=thirdparty%2Flibvirt.git

util: stop hardcoding 'ifconfig' path

Change the source to assume use of 'ifconfig' on FreeBSD builds,
allowing virCommand to report missing commands at runtime.

Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
---

diff --git a/meson.build b/meson.build
index a5a28e2c33..d2303f1e73 100644
--- a/meson.build
+++ b/meson.build
@@ -837,10 +837,6 @@ required_programs = [
   'xsltproc',
 ]
 
-if host_machine.system() == 'freebsd'
-  required_programs += 'ifconfig'
-endif
-
 foreach name : required_programs
   prog = find_program(name, dirs: libvirt_sbin_path)
   varname = name.underscorify()
diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c
index f365c1999c..f7a7db620d 100644
--- a/src/util/virnetdevip.c
+++ b/src/util/virnetdevip.c
@@ -390,8 +390,8 @@ virNetDevIPAddrAdd(const char *ifname,
         return -1;
     }
 
-# ifdef IFCONFIG
-    cmd = virCommandNew(IFCONFIG);
+# ifdef __FreeBSD__
+    cmd = virCommandNew("ifconfig");
     virCommandAddArg(cmd, ifname);
     if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6))
         virCommandAddArg(cmd, "inet6");
@@ -431,8 +431,8 @@ virNetDevIPAddrDel(const char *ifname,
 
     if (!(addrstr = virSocketAddrFormat(addr)))
         return -1;
-# ifdef IFCONFIG
-    cmd = virCommandNew(IFCONFIG);
+# ifdef __FreeBSD__
+    cmd = virCommandNew("ifconfig");
     virCommandAddArg(cmd, ifname);
     if (VIR_SOCKET_ADDR_IS_FAMILY(addr, AF_INET6))
         virCommandAddArg(cmd, "inet6");