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

[rongqing.li at windriver.com]

From: "Roy.Li" <rongqing.li at 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 at 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 \
-- 
1.7.10.4