Merge branch 'busybox' into merge

5 files changed, 10 insertions, 10 deletions

diff --git a/runit/chpst.c b/runit/chpst.c
index c2641ce8a..5e77245f6 100644
--- a/runit/chpst.c
+++ b/runit/chpst.c
@@ -28,20 +28,20 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config CHPST
-//config:       bool "chpst (8.7 kb)"
+//config:       bool "chpst (9 kb)"
 //config:       default y
 //config:       help
 //config:       chpst changes the process state according to the given options, and
 //config:       execs specified program.
 //config:
 //config:config SETUIDGID
-//config:       bool "setuidgid (4.2 kb)"
+//config:       bool "setuidgid (4 kb)"
 //config:       default y
 //config:       help
 //config:       Sets soft resource limits as specified by options
 //config:
 //config:config ENVUIDGID
-//config:       bool "envuidgid (3.6 kb)"
+//config:       bool "envuidgid (3.9 kb)"
 //config:       default y
 //config:       help
 //config:       Sets $UID to account's uid and $GID to account's gid
@@ -54,7 +54,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //config:       in the given directory
 //config:
 //config:config SOFTLIMIT
-//config:       bool "softlimit (4.3 kb)"
+//config:       bool "softlimit (4.5 kb)"
 //config:       default y
 //config:       help
 //config:       Sets soft resource limits as specified by options
diff --git a/runit/runsv.c b/runit/runsv.c
index a67280b4b..ccc762d78 100644
--- a/runit/runsv.c
+++ b/runit/runsv.c
@@ -28,7 +28,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config RUNSV
-//config:       bool "runsv (7.2 kb)"
+//config:       bool "runsv (7.8 kb)"
 //config:       default y
 //config:       help
 //config:       runsv starts and monitors a service and optionally an appendant log
diff --git a/runit/runsvdir.c b/runit/runsvdir.c
index 11ab40abf..55dd47e0d 100644
--- a/runit/runsvdir.c
+++ b/runit/runsvdir.c
@@ -28,7 +28,7 @@ ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config RUNSVDIR
-//config:       bool "runsvdir (6 kb)"
+//config:       bool "runsvdir (6.3 kb)"
 //config:       default y
 //config:       help
 //config:       runsvdir starts a runsv process for each subdirectory, or symlink to
diff --git a/runit/sv.c b/runit/sv.c
index 8054daedf..5c249ff95 100644
--- a/runit/sv.c
+++ b/runit/sv.c
@@ -154,7 +154,7 @@ Exit Codes
 /* Busyboxed by Denys Vlasenko <vda.linux@googlemail.com> */
 
 //config:config SV
-//config:       bool "sv (7.8 kb)"
+//config:       bool "sv (8.5 kb)"
 //config:       default y
 //config:       help
 //config:       sv reports the current status and controls the state of services
@@ -169,14 +169,14 @@ Exit Codes
 //config:       Defaults to "/var/service"
 //config:
 //config:config SVC
-//config:       bool "svc (7.8 kb)"
+//config:       bool "svc (8.4 kb)"
 //config:       default y
 //config:       help
 //config:       svc controls the state of services monitored by the runsv supervisor.
 //config:       It is compatible with daemontools command with the same name.
 //config:
 //config:config SVOK
-//config:       bool "svok"
+//config:       bool "svok (1.5 kb)"
 //config:       default y
 //config:       help
 //config:       svok checks whether runsv supervisor is running.
diff --git a/runit/svlogd.c b/runit/svlogd.c
index b0690d794..c9e5346d1 100644
--- a/runit/svlogd.c
+++ b/runit/svlogd.c
@@ -124,7 +124,7 @@ log message, you can use a pattern like this instead
 -*: *: pid *
 */
 //config:config SVLOGD
-//config:       bool "svlogd (15 kb)"
+//config:       bool "svlogd (16 kb)"
 //config:       default y
 //config:       help
 //config:       svlogd continuously reads log data from its standard input, optionally