diff options
| author |   Roy Li <rongqing.li@windriver.com> | 2013-11-27 16:37:10 +0800 |
|---|---|---|
| committer |   Joe MacDonald <joe@deserted.net> | 2013-11-27 15:27:36 -0500 |
| commit | 9b3e284c58bce673801ca3649b53bc53797ce2e9 (patch) | |
| tree | b939a68b69489cbe871c24294abbeeb51a9628da | |
| parent | 75c52163b0f6e847f178d5919678f3c2af6f273f (diff) | |
| download | meta-openembedded-9b3e284c58bce673801ca3649b53bc53797ce2e9.tar.gz | |
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>
| -rw-r--r-- | meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch | 39 | ||||
| -rw-r--r-- | meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb | 1 |
2 files changed, 40 insertions, 0 deletions
diff --git a/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch b/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch new file mode 100644 index 0000000000..953bbddef0 --- /dev/null +++ b/meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch @@ -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 + diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb index 29c3097035..6537b7709b 100644 --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb @@ -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" |