proftpd: move pidfile from /var/ to /var/run/

/var/run/ is more suitable to store pidfile for OE, and this fixes
"/etc/init.d/proftpd stop" failure too, since this script assumes
the pidfile is under /var/run

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Joe MacDonald <joe@deserted.net>
This commit is contained in:
Roy Li 2013-11-27 16:37:10 +08:00 committed by Joe MacDonald
parent 75c52163b0
commit 9b3e284c58
2 changed files with 40 additions and 0 deletions

View File

@ -0,0 +1,39 @@
move pidfile to /var/run
Upstream-Status: Inappropriate [configuration]
Signed-off-by: Roy Li <rongqing.li@windriver.com>
---
configure | 2 +-
configure.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index e6268f5..ebed38e 100755
--- a/configure
+++ b/configure
@@ -33587,7 +33587,7 @@ cat >>confdefs.h <<_ACEOF
_ACEOF
cat >>confdefs.h <<_ACEOF
-#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`"
+#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`"
_ACEOF
diff --git a/configure.in b/configure.in
index df9186a..e2ae868 100644
--- a/configure.in
+++ b/configure.in
@@ -2790,7 +2790,7 @@ AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`")
AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`")
AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`")
-AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`")
+AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`")
prefix="$pr_saved_prefix"
exec_prefix="$pr_saved_exec_prefix"
--
1.7.10.4

View File

@ -12,6 +12,7 @@ SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
file://contrib.patch \
file://proftpd-basic.init \
file://default \
file://move-pidfile-to-var-run.patch \
"
SRC_URI[md5sum] = "0871e0b93c9c3c88ca950b6d9a04aed2"