From c4c885b838eb9578a18c88e88b1ba071eddc53b1 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Thu, 22 Jan 2015 17:09:14 +0800 Subject: distcc: fix initscript can not stop distcc daemon correctly The distcc's initscript has used option '--pid-file' to save daemon process id, but it didn't to create that file, that caused start/stop distcc daemon failed. We refer what Ubuntu 14.04 did, create pid file before start and delete it after stop [YOCTO #7090] (From OE-Core rev: 3b0d6c7c324f0283cfab10445d1a5a3bf2526598) Signed-off-by: Hongxu Jia Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/recipes-devtools/distcc/files/distcc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/recipes-devtools/distcc/files/distcc b/meta/recipes-devtools/distcc/files/distcc index c7c414d829..e36f0fa695 100755 --- a/meta/recipes-devtools/distcc/files/distcc +++ b/meta/recipes-devtools/distcc/files/distcc @@ -51,6 +51,9 @@ should_start() { echo "$DAEMON not starting" exit 0 fi + # we need permission to write to the pid file + touch /var/run/$NAME.pid + chown distcc /var/run/$NAME.pid } case "$1" in @@ -75,6 +78,7 @@ case "$1" in echo "$0: stop failed with error code $code" >&2 exit $code } + rm -f /var/run/$NAME.pid >/dev/null 2>&1 echo "." ;; restart|force-reload) @@ -92,6 +96,7 @@ case "$1" in --exec $DAEMON -- $DAEMON_ARGS $ALLOW || { code=$? + rm -f /var/run/$NAME.pid >/dev/null 2>&1 echo "$0: restart failed with error code $code" >&2 exit $code } -- cgit v1.2.3-54-g00ecf