summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <Mingli.Yu@windriver.com>2017-12-06 15:07:08 +0800
committerArmin Kuster <akuster808@gmail.com>2017-12-10 15:03:55 -0800
commitd95d99386c211e86ec3aa67cec98f86d5b45091c (patch)
tree80fe4706eba8ea459f4a1459b8b7bf37dea15a43
parent694ab819bc573c68d376fc9a7d99ec3b5628837d (diff)
downloadmeta-security-d95d99386c211e86ec3aa67cec98f86d5b45091c.tar.gz
samhain: remove the path for start-stop-daemon
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.Yu@windriver.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--recipes-security/samhain/files/samhain-client.init12
-rw-r--r--recipes-security/samhain/files/samhain-server.init10
-rw-r--r--recipes-security/samhain/files/samhain-standalone.init12
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
70 /bin/rm -f ${PIDFILE} 70 /bin/rm -f ${PIDFILE}
71 fi 71 fi
72 # 72 #
73 echo -n "Starting ${NAME}" 73 echo -n "Starting ${NAME}"
74 /sbin/start-stop-daemon --start --quiet --exec $DAEMON 74 start-stop-daemon --start --quiet --exec $DAEMON
75 RETVAL=$? 75 RETVAL=$?
76 samhain_done 76 samhain_done
77 ;; 77 ;;
78 78
79 stop) 79 stop)
80 echo -n "Stopping $NAME" 80 echo -n "Stopping $NAME"
81 ( /sbin/start-stop-daemon --stop --quiet --exec $DAEMON ) 81 start-stop-daemon --stop --quiet --exec $DAEMON
82 RETVAL=$? 82 RETVAL=$?
83 83
84 # 84 #
@@ -101,8 +101,8 @@ case "$1" in
101 ;; 101 ;;
102 102
103 reload|force-reload) 103 reload|force-reload)
104 echo -n "Reloading $NAME configuration files" 104 echo -n "Reloading $NAME configuration files"
105 /sbin/start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON 105 start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
106 RETVAL=$? 106 RETVAL=$?
107 samhain_done 107 samhain_done
108 ;; 108 ;;
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
65 fi 65 fi
66 # 66 #
67 echo -n "Starting ${NAME}" 67 echo -n "Starting ${NAME}"
68 /sbin/start-stop-daemon --start --quiet --exec $DAEMON 68 start-stop-daemon --start --quiet --exec $DAEMON
69 RETVAL=$? 69 RETVAL=$?
70 samhain_done 70 samhain_done
71 ;; 71 ;;
72 72
73 stop) 73 stop)
74 echo -n "Stopping $NAME" 74 echo -n "Stopping $NAME"
75 ( /sbin/start-stop-daemon --stop --quiet --exec $DAEMON ) 75 start-stop-daemon --stop --quiet --exec $DAEMON
76 RETVAL=$? 76 RETVAL=$?
77 77
78 # 78 #
@@ -95,8 +95,8 @@ case "$1" in
95 ;; 95 ;;
96 96
97 reload|force-reload) 97 reload|force-reload)
98 echo -n "Reloading $NAME configuration files" 98 echo -n "Reloading $NAME configuration files"
99 /sbin/start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON 99 start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
100 RETVAL=$? 100 RETVAL=$?
101 samhain_done 101 samhain_done
102 ;; 102 ;;
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
69 /bin/rm -f ${PIDFILE} 69 /bin/rm -f ${PIDFILE}
70 fi 70 fi
71 71
72 echo -n "Starting ${NAME}" 72 echo -n "Starting ${NAME}"
73 ( /sbin/start-stop-daemon --start --quiet --exec $DAEMON ) 73 start-stop-daemon --start --quiet --exec $DAEMON
74 RETVAL=$? 74 RETVAL=$?
75 samhain_done 75 samhain_done
76 exit $RETVAL 76 exit $RETVAL
77 ;; 77 ;;
78 stop) 78 stop)
79 echo -n "Stopping $NAME" 79 echo -n "Stopping $NAME"
80 ( /sbin/start-stop-daemon --stop --quiet --exec $DAEMON ) 80 start-stop-daemon --stop --quiet --exec $DAEMON
81 RETVAL=$? 81 RETVAL=$?
82 samhain_done 82 samhain_done
83 # 83 #
@@ -99,8 +99,8 @@ case "$1" in
99 ;; 99 ;;
100 100
101 reload|force-reload) 101 reload|force-reload)
102 echo -n "Reloading $NAME configuration files" 102 echo -n "Reloading $NAME configuration files"
103 ( /sbin/start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON ) 103 start-stop-daemon --stop --signal 1 --quiet --exec $DAEMON
104 RETVAL=$? 104 RETVAL=$?
105 samhain_done 105 samhain_done
106 ;; 106 ;;