[PATCH 10/20] meson: remove check for 'ip' program

From: Daniel P. Berrangé <berrange(a)redhat.com&gt; There are no references to an "IP" conf variable nor a meson 'ip_prog' variable so the check serves no purpose. Signed-off-by: Daniel P. Berrangé <berrange(a)redhat.com&gt; --- meson.build | 1 - src/util/virnetdevip.c | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 06a69308ac..d355767a53 100644 --- a/meson.build +++ b/meson.build @@ -854,7 +854,6 @@ optional_test_programs = [ ] optional_programs = [ - 'ip', 'iscsiadm', 'mdevctl', 'mm-ctl', diff --git a/src/util/virnetdevip.c b/src/util/virnetdevip.c index f7a7db620d..d4f023ca5c 100644 --- a/src/util/virnetdevip.c +++ b/src/util/virnetdevip.c @@ -404,7 +404,7 @@ virNetDevIPAddrAdd(const char *ifname, virCommandAddArgList(cmd, "broadcast", bcaststr, NULL); virCommandAddArg(cmd, "alias"); # else - cmd = virCommandNew(IP); + cmd = virCommandNew("ip"); virCommandAddArgList(cmd, "addr", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); if (peerstr) @@ -441,7 +441,7 @@ virNetDevIPAddrDel(const char *ifname, virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArg(cmd, "-alias"); # else - cmd = virCommandNew(IP); + cmd = virCommandNew("ip"); virCommandAddArgList(cmd, "addr", "del", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "dev", ifname, NULL); @@ -469,7 +469,7 @@ virNetDevIPRouteAdd(const char *ifname, return -1; if (!(gatewaystr = virSocketAddrFormat(gateway))) return -1; - cmd = virCommandNew(IP); + cmd = virCommandNew("ip"); virCommandAddArgList(cmd, "route", "add", NULL); virCommandAddArgFormat(cmd, "%s/%u", addrstr, prefix); virCommandAddArgList(cmd, "via", gatewaystr, "dev", ifname, -- 2.49.0