From c2c0cb98cebcc57118ca8409816320ebe11a44ef Mon Sep 17 00:00:00 2001 From: David Sheets Date: Tue, 7 Jun 2016 22:21:16 +0100 Subject: [PATCH 1/2] transfused: when starting, wait up to 2s for pidfile to appear pidfile appearance is triggered by start-up mount completion. Signed-off-by: David Sheets --- alpine/packages/transfused/etc/init.d/transfused | 2 ++ 1 file changed, 2 insertions(+) diff --git a/alpine/packages/transfused/etc/init.d/transfused b/alpine/packages/transfused/etc/init.d/transfused index 551236803..c88e16d65 100755 --- a/alpine/packages/transfused/etc/init.d/transfused +++ b/alpine/packages/transfused/etc/init.d/transfused @@ -29,6 +29,8 @@ start() -p "${PIDFILE}" \ -l "${STARTUP_LOGFILE}" + ewaitfile 2 ${PIDFILE} + eend $? "Failed to start transfused" } From c6cc81445463d4daaff96075282f6c9eb06c99ab Mon Sep 17 00:00:00 2001 From: David Sheets Date: Tue, 7 Jun 2016 22:22:23 +0100 Subject: [PATCH 2/2] transfused: remove rc script cruft Signed-off-by: David Sheets --- alpine/packages/transfused/etc/init.d/transfused | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/alpine/packages/transfused/etc/init.d/transfused b/alpine/packages/transfused/etc/init.d/transfused index c88e16d65..e7002217d 100755 --- a/alpine/packages/transfused/etc/init.d/transfused +++ b/alpine/packages/transfused/etc/init.d/transfused @@ -8,18 +8,8 @@ start() mkdir -p /Mac - if cat /proc/cmdline | grep -q 'com.docker.driverDir' - then - DRIVERDIR="/Mac$(cat /proc/cmdline | sed -e 's/.*com.docker.driverDir="//' -e 's/".*//')" - RUNTIME_LOGFILE=${DRIVERDIR}/log/transfused.log - else - ID=$(LC_CTYPE=C tr -dc A-Za-z0-9 < /dev/urandom | head -c 8) - RUNTIME_LOGFILE="/Mac/private/tmp/transfused_${ID}.log" - fi - PIDFILE=/var/run/transfused.pid STARTUP_LOGFILE=/var/transfused_start.log - MOUNT_TRIGGER=/Mac start-stop-daemon --start --quiet \ --background \