From 6bfead9893689bb90b10f13689f10a77cdca4e53 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20P=2E=20Berrang=C3=A9?= Date: Mon, 28 Apr 2025 11:47:34 +0100 Subject: [PATCH] util: stop hardcoding 'ifconfig' path MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change the source to assume use of 'ifconfig' on FreeBSD builds, allowing virCommand to report missing commands at runtime. Reviewed-by: Peter Krempa Signed-off-by: Daniel P. Berrangé --- meson.build | 4 ---- src/util/virnetdevip.c | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) 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"); -- 2.47.3