From 1c97fa61de9c4959167605c75a7de47b13a428a8 Mon Sep 17 00:00:00 2001
From: Jess Frazelle <acidburn@google.com>
Date: Thu, 2 Mar 2017 15:00:12 -0800
Subject: [PATCH] disctccd

Signed-off-by: Jess Frazelle <acidburn@google.com>
---
 distcc/Dockerfile   |  4 +---
 distcc/distccd-init | 45 +++------------------------------------------
 2 files changed, 4 insertions(+), 45 deletions(-)

diff --git a/distcc/Dockerfile b/distcc/Dockerfile
index 433978e..462064b 100644
--- a/distcc/Dockerfile
+++ b/distcc/Dockerfile
@@ -16,8 +16,6 @@ RUN apt-get update && apt-get install -y \
 ENV HOME /root
 WORKDIR $HOME
 
-ENV JOBS 4
-
 COPY distccd-init /usr/local/bin/distccd-init
 
-CMD [ "distccd-init", "start" ]
+ENTRYPOINT [ "distccd-init" ]
diff --git a/distcc/distccd-init b/distcc/distccd-init
index c604af2..9f4946e 100755
--- a/distcc/distccd-init
+++ b/distcc/distccd-init
@@ -11,58 +11,19 @@
 #
 # Version:	@(#)skeleton  1.9.1  08-Apr-2002  miquels@cistron.nl
 #
+set -e
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/bin/distccd
 NAME=distccd
 DESC="Distributed Compiler Daemon"
-DAEMON_ARGS="--nice=10 --port=4200 --pid-file=/var/run/$NAME.pid \
-	--log-file=/var/log/$NAME.log --daemon"
+DAEMON_ARGS="--nice=10 --port=4200 --pid-file=/var/run/$NAME.pid --no-detach $@"
 
 test -x $DAEMON || exit 0
 
-set -e
 
 # we need permission to write to the pid file
 touch /var/run/$NAME.pid
 chown distccd /var/run/$NAME.pid
 
-case "$1" in
-	start)
-		echo -n "Starting $DESC: $NAME"
-		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-			--chuid distccd \
-			--exec $DAEMON -- $DAEMON_ARGS
-		echo "."
-		;;
-	stop)
-		echo -n "Stopping $DESC: $NAME "
-		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-			--oknodo \
-			--exec $DAEMON
-		echo "."
-		;;
-	restart|force-reload)
-		#
-		#	If the "reload" option is implemented, move the "force-reload"
-		#	option to the "reload" entry above. If not, "force-reload" is
-		#	just the same as "restart".
-		#
-		echo -n "Restarting $DESC: $NAME"
-		start-stop-daemon --stop --quiet --pidfile /var/run/$NAME.pid \
-			--oknodo \
-			--exec $DAEMON
-		sleep 1
-		start-stop-daemon --start --quiet --pidfile /var/run/$NAME.pid \
-			--chuid distccd \
-			--exec $DAEMON -- $DAEMON_ARGS
-		echo "."
-		;;
-	*)
-		N=/etc/init.d/$NAME
-		echo "Usage: $N {start|stop|restart|force-reload}" >&2
-		exit 1
-		;;
-esac
-
-exit 0
+exec $DAEMON $DAEMON_ARGS