summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Rorvick <chris@rorvick.com>2018-01-20 06:13:26 -0600
committerPatrice Clement <monsieurp@gentoo.org>2018-04-12 09:45:31 +0200
commita1c0851a496509240d8292e3d080b4eb97cd4851 (patch)
tree354786c38f7b012c1124d42c7958b4ef3f35c977
parentprofiles: add default/linux/x86/17.0/hardened/selinux (diff)
downloadgentoo-a1c0851a496509240d8292e3d080b4eb97cd4851.tar.gz
gentoo-a1c0851a496509240d8292e3d080b4eb97cd4851.tar.bz2
gentoo-a1c0851a496509240d8292e3d080b4eb97cd4851.zip
net-misc/cfengine: find ifconfig(8) in /bin/.
The ebuild applies a patch intending to look for ifconfig(8) in /bin/ after not finding it in /sbin/. The patch is obviously wrong, though, and is instead requiring ifconfig to be found in *both* locations. Closes: http://bugs.gentoo.org/645106 Closes: https://github.com/gentoo/gentoo/pull/6913
-rw-r--r--net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch2
1 files changed, 1 insertions, 1 deletions
diff --git a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
index ae0f491347f9..a31b3513ded4 100644
--- a/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
+++ b/net-misc/cfengine/files/cfengine-3.6.2-ifconfig.patch
@@ -5,7 +5,7 @@
}
#else
- if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL)
-+ if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL || (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
++ if ((pp = cf_popen("/sbin/ifconfig -a", "r", true)) == NULL && (pp = cf_popen("/bin/ifconfig -a", "r", true)) == NULL)
{
Log(LOG_LEVEL_VERBOSE, "Could not find interface info");
return;