[PATCH 05/20] util: stop hardcoding 'ifconfig' path

From: Daniel P. Berrangé <berrange(a)redhat.com&gt; Change the source to assume use of 'ifconfig' on FreeBSD builds, allowing virCommand to report missing commands at runtime. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- meson.build | 4 ---- src/util/virnetdevip.c | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/meson.build b/meson.build index b0b6efee8e..ea3e752f93 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"); -- 2.49.0