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 a5a28e2c337bf357eaf51b8a5fe85dcb6c040646..d2303f1e738fea56c15c194acceb0fc927e4f3f0 100644 (file)
--- 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 f365c1999c3d358a6a7b56ebda9f318c25fe96fd..f7a7db620da18105f249dda41a0ad00ee1355069 100644 (file)
--- 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");