[oe-commits] [meta-openembedded] 05/12: net-snmp: check that executable is used before testing for existance

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

joe_macdonald pushed a commit to branch master
in repository meta-openembedded.

commit ba0e19ad5b2f97072b7eb465be3ac5d29e8751f4
Author: Bill Randle <bill.randle at gmail.com>
AuthorDate: Sun Sep 24 10:31:31 2017 -0700

    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 at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
    Signed-off-by: Joe MacDonald <joe_macdonald at mentor.com>
---
 meta-networking/recipes-protocols/net-snmp/files/init | 6 +++---
 1 file 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 2b8fe18..4799546 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:"

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.