[meta-oe][PATCH] tftpd-hpa: fix premature exit

[meta-oe][PATCH] tftpd-hpa: fix premature exit

[David Turgeon]

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>
---
 .../recipes-daemons/tftp-hpa/files/init            |   13 +++++++------
 1 file 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
-- 
1.7.9.5

Re: [meta-oe][PATCH] tftpd-hpa: fix premature exit

[David Turgeon]

ping


On 12 October 2013 08:04, David Turgeon <david.turgeon@gmail.com> wrote:

> 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>
> ---
>  .../recipes-daemons/tftp-hpa/files/init            |   13 +++++++------
>  1 file 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
> --
> 1.7.9.5
>
>


-- 
Dave

Re: [meta-oe][PATCH] tftpd-hpa: fix premature exit

[Joe MacDonald]

[-- Attachment #1: Type: text/plain, Size: 1607 bytes --]

Merged, thanks.

-J.

[[oe] [meta-oe][PATCH] tftpd-hpa: fix premature exit] On 13.10.12 (Sat 10:04) David Turgeon wrote:

> 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>
> ---
>  .../recipes-daemons/tftp-hpa/files/init            |   13 +++++++------
>  1 file 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
-- 
-Joe MacDonald.
:wq

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]