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 /meta-networking/recipes-daemons/proftpd/files | |
| 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>
Diffstat (limited to 'meta-networking/recipes-daemons/proftpd/files')
| -rw-r--r-- | meta-networking/recipes-daemons/proftpd/files/move-pidfile-to-var-run.patch | 39 |
1 files changed, 39 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 @@ | |||
| 1 | move pidfile to /var/run | ||
| 2 | |||
| 3 | Upstream-Status: Inappropriate [configuration] | ||
| 4 | |||
| 5 | Signed-off-by: Roy Li <rongqing.li@windriver.com> | ||
| 6 | --- | ||
| 7 | configure | 2 +- | ||
| 8 | configure.in | 2 +- | ||
| 9 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/configure b/configure | ||
| 12 | index e6268f5..ebed38e 100755 | ||
| 13 | --- a/configure | ||
| 14 | +++ b/configure | ||
| 15 | @@ -33587,7 +33587,7 @@ cat >>confdefs.h <<_ACEOF | ||
| 16 | _ACEOF | ||
| 17 | |||
| 18 | cat >>confdefs.h <<_ACEOF | ||
| 19 | -#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/proftpd.pid"`" | ||
| 20 | +#define PR_PID_FILE_PATH "`eval echo "${localstatedir}/run/proftpd.pid"`" | ||
| 21 | _ACEOF | ||
| 22 | |||
| 23 | |||
| 24 | diff --git a/configure.in b/configure.in | ||
| 25 | index df9186a..e2ae868 100644 | ||
| 26 | --- a/configure.in | ||
| 27 | +++ b/configure.in | ||
| 28 | @@ -2790,7 +2790,7 @@ AC_DEFINE_UNQUOTED(PR_LOCALE_DIR, "`eval echo "${locale_dir}"`") | ||
| 29 | |||
| 30 | AC_DEFINE_UNQUOTED(PR_RUN_DIR, "`eval echo "${localstatedir}"`") | ||
| 31 | AC_DEFINE_UNQUOTED(PR_CONFIG_FILE_PATH, "`eval echo "${sysconfdir}/proftpd.conf"`") | ||
| 32 | -AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/proftpd.pid"`") | ||
| 33 | +AC_DEFINE_UNQUOTED(PR_PID_FILE_PATH, "`eval echo "${localstatedir}/run/proftpd.pid"`") | ||
| 34 | |||
| 35 | prefix="$pr_saved_prefix" | ||
| 36 | exec_prefix="$pr_saved_exec_prefix" | ||
| 37 | -- | ||
| 38 | 1.7.10.4 | ||
| 39 | |||
