From d96c23b4cb771da1047ee1bd2011f8e3c4cdc413 Mon Sep 17 00:00:00 2001 From: David Turgeon Date: Sat, 12 Oct 2013 10:04:00 -0400 Subject: tftpd-hpa: fix premature exit standalone daemon exits as recipe installs file as tftpd-hpa * Changed script so it can consult /etc/default, as daemon name may be subject to change. * Changed the default name to match the recipe Signed-off-by: David Turgeon Signed-off-by: Joe MacDonald --- meta-networking/recipes-daemons/tftp-hpa/files/init | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'meta-networking/recipes-daemons') diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/init b/meta-networking/recipes-daemons/tftp-hpa/files/init index 5ad8c52cb8..9e1843635c 100644 --- a/meta-networking/recipes-daemons/tftp-hpa/files/init +++ b/meta-networking/recipes-daemons/tftp-hpa/files/init @@ -18,20 +18,21 @@ set -e PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin DESC="HPA's tftpd" -NAME=in.tftpd -DAEMON=/usr/sbin/$NAME -PIDFILE=/var/run/$NAME.pid +NAME=in.tftpd-hpa SCRIPTNAME=/etc/init.d/tftpd-hpa -# Gracefully exit if the package has been removed. -test -x $DAEMON || exit 0 - # Read config file if it is present. if [ -r /etc/default/tftpd-hpa ] then . /etc/default/tftpd-hpa fi +DAEMON=/usr/sbin/$NAME +PIDFILE=/var/run/$NAME.pid + +# Gracefully exit if the package has been removed. +test -x $DAEMON || exit 0 + if [ "$RUN_DAEMON" != "yes" ] ; then echo "tftpd-hpa disabled in /etc/default/tftpd-hpa" exit 0 -- cgit 1.2.3-korg