From: Mingli Yu <mingli...@windriver.com> Remove the absolute path for start-stop-daemon to fix samhain start-up as start-stop-daemon sometimes located in /usr/sbin, not the expected /sbin.
Signed-off-by: Mingli Yu <mingli...@windriver.com> --- recipes-security/samhain/files/samhain-client.init | 12 ++++++------ recipes-security/samhain/files/samhain-server.init | 10 +++++----- recipes-security/samhain/files/samhain-standalone.init | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/recipes-security/samhain/files/samhain-client.init b/recipes-security/samhain/files/samhain-client.init index 730e1c4..d5fabed 100644 --- a/recipes-security/samhain/files/samhain-client.init +++ b/recipes-security/samhain/files/samhain-client.init @@ -70,15 +70,15 @@ case "$1" in /bin/rm -f ${PIDFILE} fi # - echo -n "Starting ${NAME}" - /sbin/start-stop-daemon --start --quiet --exec $DAEMON + echo -n "Starting ${NAME}" + start-stop-daemon --start --quiet --exec $DAEMON RETVAL=$? samhain_done ;; stop) - echo -n "Stopping $NAME" - ( /sbin/start-stop-daemon --stop --quiet --exec $DAEMON ) + echo -n "Stopping $NAME" + start-stop-daemon --stop --quiet --exec $DAEMON RETVAL=$? # @@ -101,8 +101,8 @@ case "$1" in ;; reload|force-reload) - echo -n "Reloading $NAME configuration files" - /sbin/start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON + echo -n "Reloading $NAME configuration files" + start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON RETVAL=$? samhain_done ;; diff --git a/recipes-security/samhain/files/samhain-server.init b/recipes-security/samhain/files/samhain-server.init index 89bd0aa..c456e51 100644 --- a/recipes-security/samhain/files/samhain-server.init +++ b/recipes-security/samhain/files/samhain-server.init @@ -65,14 +65,14 @@ case "$1" in fi # echo -n "Starting ${NAME}" - /sbin/start-stop-daemon --start --quiet --exec $DAEMON + start-stop-daemon --start --quiet --exec $DAEMON RETVAL=$? samhain_done ;; stop) - echo -n "Stopping $NAME" - ( /sbin/start-stop-daemon --stop --quiet --exec $DAEMON ) + echo -n "Stopping $NAME" + start-stop-daemon --stop --quiet --exec $DAEMON RETVAL=$? # @@ -95,8 +95,8 @@ case "$1" in ;; reload|force-reload) - echo -n "Reloading $NAME configuration files" - /sbin/start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON + echo -n "Reloading $NAME configuration files" + start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON RETVAL=$? samhain_done ;; diff --git a/recipes-security/samhain/files/samhain-standalone.init b/recipes-security/samhain/files/samhain-standalone.init index ac28efd..2f23bff 100644 --- a/recipes-security/samhain/files/samhain-standalone.init +++ b/recipes-security/samhain/files/samhain-standalone.init @@ -69,15 +69,15 @@ case "$1" in /bin/rm -f ${PIDFILE} fi - echo -n "Starting ${NAME}" - ( /sbin/start-stop-daemon --start --quiet --exec $DAEMON ) + echo -n "Starting ${NAME}" + start-stop-daemon --start --quiet --exec $DAEMON RETVAL=$? samhain_done exit $RETVAL ;; stop) - echo -n "Stopping $NAME" - ( /sbin/start-stop-daemon --stop --quiet --exec $DAEMON ) + echo -n "Stopping $NAME" + start-stop-daemon --stop --quiet --exec $DAEMON RETVAL=$? samhain_done # @@ -99,8 +99,8 @@ case "$1" in ;; reload|force-reload) - echo -n "Reloading $NAME configuration files" - ( /sbin/start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON ) + echo -n "Reloading $NAME configuration files" + start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON RETVAL=$? samhain_done ;; -- 2.13.3 -- _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto