Merge branch 'busybox' into merge

1 files changed, 13 insertions, 2 deletions

diff --git a/Config.in b/Config.in
index def0c2c32..8999e1699 100644
--- a/Config.in
+++ b/Config.in
@@ -333,7 +333,18 @@ config FEATURE_PIDFILE
         default y
         help
           This option makes some applets (e.g. crond, syslogd, inetd) write
-          a pidfile in /var/run. Some applications rely on them.
+          a pidfile at the configured PID_FILE_PATH.  It has no effect
+          on applets which require pidfiles to run.
+
+config PID_FILE_PATH
+        string "Path to directory for pidfile"
+        default "/var/run"
+        depends on FEATURE_PIDFILE
+        help
+          This is the default path where pidfiles are created.  Applets which
+          allow you to set the pidfile path on the command line will override
+          this value.  The option has no effect on applets that require you to
+          specify a pidfile path.
 
 config FEATURE_SUID
         bool "Support for SUID/SGID handling"
@@ -344,7 +355,7 @@ config FEATURE_SUID
           root-level operations even when run by ordinary users
           (for example, mounting of user mounts in fstab needs this).
 
-          Busybox will automatically drop priviledges for applets
+          Busybox will automatically drop privileges for applets
           that don't need root access.
 
           If you are really paranoid and don't want to do this, build two