[oe-commits] David Turgeon : tftpd-hpa: fix premature exit
git at git.openembedded.org
git at git.openembedded.org
Fri Oct 18 18:55:40 UTC 2013
Module: meta-openembedded.git
Branch: master
Commit: d96c23b4cb771da1047ee1bd2011f8e3c4cdc413
URL: http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=d96c23b4cb771da1047ee1bd2011f8e3c4cdc413
Author: David Turgeon <david.turgeon at gmail.com>
Date: Sat Oct 12 10:04:00 2013 -0400
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 at gmail.com>
Signed-off-by: Joe MacDonald <joe at deserted.net>
---
.../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 5ad8c52..9e18436 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
More information about the Openembedded-commits
mailing list