aboutsummaryrefslogtreecommitdiffstats
path: root/meta-networking
diff options
context:
space:
mode:
authorBill Randle <bill.randle@gmail.com>2017-09-24 10:31:31 -0700
committerJoe MacDonald <joe_macdonald@mentor.com>2017-10-11 16:22:49 -0400
commitba0e19ad5b2f97072b7eb465be3ac5d29e8751f4 (patch)
treea32c8bc946468e113fc434a791ccba9022e5dc26 /meta-networking
parente72b72c5b0b66d3368195d2534a32e75bc7c6fad (diff)
downloadmeta-openembedded-contrib-ba0e19ad5b2f97072b7eb465be3ac5d29e8751f4.tar.gz
meta-openembedded-contrib-ba0e19ad5b2f97072b7eb465be3ac5d29e8751f4.tar.bz2
meta-openembedded-contrib-ba0e19ad5b2f97072b7eb465be3ac5d29e8751f4.zip
net-snmp: check that executable is used before testing for existance
The recipe for net-snmp has snmpd and snmptrapd in seperate packages, so one or the other or both could be installed. In a common case where only snmpd is installed, the startup script will fail to run because the snmptrapd executable does not exist. This patch simply qualifies the test by first checking to see if the executable is to be used. -Bill Signed-off-by: Bill Randle <bill.randle@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Joe MacDonald <joe_macdonald@mentor.com>
Diffstat (limited to 'meta-networking')
-rwxr-xr-xmeta-networking/recipes-protocols/net-snmp/files/init6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta-networking/recipes-protocols/net-snmp/files/init b/meta-networking/recipes-protocols/net-snmp/files/init
index 2b8fe18b34..47995466fb 100755
--- a/meta-networking/recipes-protocols/net-snmp/files/init
+++ b/meta-networking/recipes-protocols/net-snmp/files/init
@@ -3,9 +3,6 @@
. /etc/init.d/functions
-test -x /usr/sbin/snmpd || exit 0
-test -x /usr/sbin/snmptrapd || exit 0
-
# Defaults
export MIBDIRS=/usr/share/snmp/mibs
SNMPDRUN=yes
@@ -18,6 +15,9 @@ SPIDFILE=/var/run/snmptrapd.pid
# Reads config file if exists (will override defaults above)
[ -r /etc/default/snmpd ] && . /etc/default/snmpd
+[ "$SNMPDRUN" = "yes" ] && { test -x /usr/sbin/snmpd || exit 0; }
+[ "$TRAPDRUN" = "yes" ] && { test -x /usr/sbin/snmptrapd || exit 0; }
+
case "$1" in
start)
echo -n "Starting network management services:"