diff options
author | David Turgeon <david.turgeon@gmail.com> | 2013-10-12 10:04:00 -0400 |
---|---|---|
committer | Joe MacDonald <joe@deserted.net> | 2013-10-18 12:26:55 -0400 |
commit | d96c23b4cb771da1047ee1bd2011f8e3c4cdc413 (patch) | |
tree | ed06695f243e670db9ea80db787dfa8fb1bc6aa2 /meta-networking | |
parent | d56605b3fe5296d73b9851a53ecb3805ec85288b (diff) | |
download | meta-openembedded-contrib-d96c23b4cb771da1047ee1bd2011f8e3c4cdc413.tar.gz |
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 <david.turgeon@gmail.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
Diffstat (limited to 'meta-networking')
-rw-r--r-- | meta-networking/recipes-daemons/tftp-hpa/files/init | 13 |
1 files changed, 7 insertions, 6 deletions
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 |