Date: Wed, 13 Aug 2014 12:35:12 +0000 (UTC) From: Gavin Atkinson <gavin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r269929 - stable/10/usr.sbin/jail Message-ID: <201408131235.s7DCZChR006666@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gavin Date: Wed Aug 13 12:35:11 2014 New Revision: 269929 URL: http://svnweb.freebsd.org/changeset/base/269929 Log: Merge r268488 from head: Reword an awkward option description PR: 191726 Submitted by: yaneurabeya gmail.com Modified: stable/10/usr.sbin/jail/jail.8 Directory Properties: stable/10/ (props changed) Modified: stable/10/usr.sbin/jail/jail.8 ============================================================================== --- stable/10/usr.sbin/jail/jail.8 Wed Aug 13 12:32:52 2014 (r269928) +++ stable/10/usr.sbin/jail/jail.8 Wed Aug 13 12:35:11 2014 (r269929) @@ -653,8 +653,9 @@ file, instead of in the prison's file. The user to run commands as, when running in the system environment. The default is to run the commands as the current user. .It Va exec.timeout -The maximum amount of time to wait for a command to complete. -If a command is still running after this many seconds have passed, +The maximum amount of time to wait for a command to complete, in +seconds. +If a command is still running after this timeout has passed, the jail not be created or removed. .It Va exec.consolelog A file to direct command output (stdout and stderr) to.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408131235.s7DCZChR006666>