Patchwork [meta-networking] tftp-hpa: make init script work

login
register
mail settings
Submitter rongqing.li@windriver.com
Date March 5, 2013, 1 a.m.
Message ID <1362445249-12669-1-git-send-email-rongqing.li@windriver.com>
Download mbox | patch
Permalink /patch/45499/
State Not Applicable, archived
Headers show

Comments

rongqing.li@windriver.com - March 5, 2013, 1 a.m.
From: "Roy.Li" <rongqing.li@windriver.com>

1. fix the daemon name, it should be in.tftpd-hpa
2. root directory should be /var/lib/tftpboot, since /var/lib/tftpboot has been
installed, but /srv/tftpboot not

Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
 meta-networking/recipes-daemons/tftp-hpa/files/default   |    2 +-
 meta-networking/recipes-daemons/tftp-hpa/files/init      |    2 +-
 meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
Joe MacDonald - March 18, 2013, 3:39 p.m.
Hey Roy,

[[meta-networking][PATCH] tftp-hpa: make init script work] On 13.03.05 (Tue 09:00) rongqing.li@windriver.com wrote:

> From: "Roy.Li" <rongqing.li@windriver.com>
> 
> 1. fix the daemon name, it should be in.tftpd-hpa
> 2. root directory should be /var/lib/tftpboot, since /var/lib/tftpboot has been
> installed, but /srv/tftpboot not

Hmm.  This is a bit problematic for me.  I wouldn't normally bat an eye
at such a change, but because the original recipe specifically pointed
the tftp server at /srv and when I looked at my own tftp server, that's
where it was set.  It's been so long since I did anything with it I'd
forgotten why I put the contents there, so I thought I'd have a quick
look-see as to why.  Turns out that's actually the FHS-recommended
location:

   http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM

And this has been identified and fixed in at least Ubuntu:

   https://bugs.launchpad.net/ubuntu/+source/tftp-hpa/+bug/84615

Unless there's a strong objection, I'd prefer to see a fix for this that
updates the recipe to install into /svc/tftpboot, rather than changing
the daemon options to look in /var/lib/tftpboot.

Changing the name is fine with me (will this cause pain for the systemd
folks?).

-J.

> 
> Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> ---
>  meta-networking/recipes-daemons/tftp-hpa/files/default   |    2 +-
>  meta-networking/recipes-daemons/tftp-hpa/files/init      |    2 +-
>  meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb |    2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/default b/meta-networking/recipes-daemons/tftp-hpa/files/default
> index de2ed18..1dce7fd 100644
> --- a/meta-networking/recipes-daemons/tftp-hpa/files/default
> +++ b/meta-networking/recipes-daemons/tftp-hpa/files/default
> @@ -1,3 +1,3 @@
>  #Defaults for tftpd-hpa
>  RUN_DAEMON="yes"
> -OPTIONS="-l -s /srv/tftpboot"
> +OPTIONS="-l -s /var/lib/tftpboot"
> diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/init b/meta-networking/recipes-daemons/tftp-hpa/files/init
> index 5ad8c52..0561ff6 100644
> --- a/meta-networking/recipes-daemons/tftp-hpa/files/init
> +++ b/meta-networking/recipes-daemons/tftp-hpa/files/init
> @@ -18,7 +18,7 @@ set -e
>  
>  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
>  DESC="HPA's tftpd"
> -NAME=in.tftpd
> +NAME=in.tftpd-hpa
>  DAEMON=/usr/sbin/$NAME
>  PIDFILE=/var/run/$NAME.pid
>  SCRIPTNAME=/etc/init.d/tftpd-hpa
> diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
> index af48455..c116121 100644
> --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
> +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
> @@ -11,7 +11,7 @@ LICENSE = "BSD-4-Clause"
>  LIC_FILES_CHKSUM = "file://MCONFIG.in;beginline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \
>                      file://tftp/tftp.c;beginline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4"
>  
> -PR = "r0"
> +PR = "r1"
>  
>  SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.tar.bz2 \
>             file://tftp-0.40-remap.patch \
Joe MacDonald - March 22, 2013, 1:11 p.m.
[Re: [meta-networking][PATCH] tftp-hpa: make init script work] On 13.03.18 (Mon 11:39) Joe MacDonald wrote:

> Hey Roy,
> 
> [[meta-networking][PATCH] tftp-hpa: make init script work] On 13.03.05 (Tue 09:00) rongqing.li@windriver.com wrote:
> 
> > From: "Roy.Li" <rongqing.li@windriver.com>
> > 
> > 1. fix the daemon name, it should be in.tftpd-hpa
> > 2. root directory should be /var/lib/tftpboot, since /var/lib/tftpboot has been
> > installed, but /srv/tftpboot not
> 
> Hmm.  This is a bit problematic for me.  I wouldn't normally bat an eye
> at such a change, but because the original recipe specifically pointed
> the tftp server at /srv and when I looked at my own tftp server, that's
> where it was set.  It's been so long since I did anything with it I'd
> forgotten why I put the contents there, so I thought I'd have a quick
> look-see as to why.  Turns out that's actually the FHS-recommended
> location:
> 
>    http://www.pathname.com/fhs/pub/fhs-2.3.html#SRVDATAFORSERVICESPROVIDEDBYSYSTEM
> 
> And this has been identified and fixed in at least Ubuntu:
> 
>    https://bugs.launchpad.net/ubuntu/+source/tftp-hpa/+bug/84615
> 
> Unless there's a strong objection, I'd prefer to see a fix for this that
> updates the recipe to install into /svc/tftpboot, rather than changing
> the daemon options to look in /var/lib/tftpboot.

Roy?  Just a ping.

-J.

> 
> Changing the name is fine with me (will this cause pain for the systemd
> folks?).
> 
> -J.
> 
> > 
> > Signed-off-by: Roy.Li <rongqing.li@windriver.com>
> > ---
> >  meta-networking/recipes-daemons/tftp-hpa/files/default   |    2 +-
> >  meta-networking/recipes-daemons/tftp-hpa/files/init      |    2 +-
> >  meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb |    2 +-
> >  3 files changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/default b/meta-networking/recipes-daemons/tftp-hpa/files/default
> > index de2ed18..1dce7fd 100644
> > --- a/meta-networking/recipes-daemons/tftp-hpa/files/default
> > +++ b/meta-networking/recipes-daemons/tftp-hpa/files/default
> > @@ -1,3 +1,3 @@
> >  #Defaults for tftpd-hpa
> >  RUN_DAEMON="yes"
> > -OPTIONS="-l -s /srv/tftpboot"
> > +OPTIONS="-l -s /var/lib/tftpboot"
> > diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/init b/meta-networking/recipes-daemons/tftp-hpa/files/init
> > index 5ad8c52..0561ff6 100644
> > --- a/meta-networking/recipes-daemons/tftp-hpa/files/init
> > +++ b/meta-networking/recipes-daemons/tftp-hpa/files/init
> > @@ -18,7 +18,7 @@ set -e
> >  
> >  PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
> >  DESC="HPA's tftpd"
> > -NAME=in.tftpd
> > +NAME=in.tftpd-hpa
> >  DAEMON=/usr/sbin/$NAME
> >  PIDFILE=/var/run/$NAME.pid
> >  SCRIPTNAME=/etc/init.d/tftpd-hpa
> > diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
> > index af48455..c116121 100644
> > --- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
> > +++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
> > @@ -11,7 +11,7 @@ LICENSE = "BSD-4-Clause"
> >  LIC_FILES_CHKSUM = "file://MCONFIG.in;beginline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \
> >                      file://tftp/tftp.c;beginline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4"
> >  
> > -PR = "r0"
> > +PR = "r1"
> >  
> >  SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.tar.bz2 \
> >             file://tftp-0.40-remap.patch \

Patch

diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/default b/meta-networking/recipes-daemons/tftp-hpa/files/default
index de2ed18..1dce7fd 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/files/default
+++ b/meta-networking/recipes-daemons/tftp-hpa/files/default
@@ -1,3 +1,3 @@ 
 #Defaults for tftpd-hpa
 RUN_DAEMON="yes"
-OPTIONS="-l -s /srv/tftpboot"
+OPTIONS="-l -s /var/lib/tftpboot"
diff --git a/meta-networking/recipes-daemons/tftp-hpa/files/init b/meta-networking/recipes-daemons/tftp-hpa/files/init
index 5ad8c52..0561ff6 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/files/init
+++ b/meta-networking/recipes-daemons/tftp-hpa/files/init
@@ -18,7 +18,7 @@  set -e
 
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DESC="HPA's tftpd"
-NAME=in.tftpd
+NAME=in.tftpd-hpa
 DAEMON=/usr/sbin/$NAME
 PIDFILE=/var/run/$NAME.pid
 SCRIPTNAME=/etc/init.d/tftpd-hpa
diff --git a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
index af48455..c116121 100644
--- a/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
+++ b/meta-networking/recipes-daemons/tftp-hpa/tftp-hpa_5.2.bb
@@ -11,7 +11,7 @@  LICENSE = "BSD-4-Clause"
 LIC_FILES_CHKSUM = "file://MCONFIG.in;beginline=1;endline=9;md5=c28ba5adb43041fae4629db05c83cbdd \
                     file://tftp/tftp.c;beginline=1;endline=32;md5=988c1cba99d70858a26cd877209857f4"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://kernel.org/pub/software/network/tftp/tftp-hpa/tftp-hpa-${PV}.tar.bz2 \
            file://tftp-0.40-remap.patch \