- Change the "jail_" prefix for internal script variables. This fixes an

issue where some global jail_* variables were overriden in the script. [1]
- Change "jid" to "jname" in rc.conf(5), since it's more a jail name than a
jail id. [1]
- Update examples and comments in defaults/rc.conf to advertise new
variables and the fact that some of the jail-specific variables may be made
jail-global. [2]

Reported by:	pjd [1], clsung [2]
Approved by:	cperciva
X-MFC after:	i got sufficient testing from people using rc.d/jail

1 files changed, 34 insertions, 34 deletions

diff --git a/share/man/man5/rc.conf.5 b/share/man/man5/rc.conf.5
index 5a8b276..ab2aa8f 100644
--- a/share/man/man5/rc.conf.5
+++ b/share/man/man5/rc.conf.5
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd April 18, 2006
+.Dd May 11, 2006
 .Dt RC.CONF 5
 .Os
 .Sh NAME
@@ -3010,21 +3010,21 @@ jail_vjail_rootdir="/var/jails/vjail/root"
 .Pq Vt str
 Unset by default.
 When set, use as default value for
-.Va jail_ Ns Ao Ar jid Ac Ns Va _flags
+.Va jail_ Ns Ao Ar jname Ac Ns Va _flags
 for every jail in
 .Va jail_list .
 .It Va jail_interface
 .Pq Vt str
 Unset by default.
 When set, use as default value for
-.Va jail_ Ns Ao Ar jid Ac Ns Va _interface
+.Va jail_ Ns Ao Ar jname Ac Ns Va _interface
 for every jail in
 .Va jail_list .
 .It Va jail_fstab
 .Pq Vt str
 Unset by default.
 When set, use as default value for
-.Va jail_ Ns Ao Ar jid Ac Ns Va _fstab
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
 for every jail in
 .Va jail_list .
 .It Va jail_mount_enable
@@ -3035,14 +3035,14 @@ by default.
 When set to
 .Dq Li YES ,
 sets
-.Va jail_ Ns Ao Ar jid Ac Ns Va _mount_enable
+.Va jail_ Ns Ao Ar jname Ac Ns Va _mount_enable
 to YES by default for every jail in
 .Va jail_list .
 .It Va jail_devfs_ruleset
 .Pq Vt str
 Unset by default.
 When set, sets
-.Va jail_ Ns Ao Ar jid Ac Ns Va _devfs_ruleset
+.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset
 to given value for every jail in
 .Va jail_list .
 .It Va jail_devfs_enable
@@ -3053,7 +3053,7 @@ by default.
 When set to
 .Dq Li YES ,
 sets
-.Va jail_ Ns Ao Ar jid Ac Ns Va _devfs_enable
+.Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_enable
 to YES by default for every jail in
 .Va jail_list .
 .It Va jail_fdescfs_enable
@@ -3064,7 +3064,7 @@ by default.
 When set to
 .Dq Li YES ,
 sets
-.Va jail_ Ns Ao Ar jid Ac Ns Va _fdescfs_enable
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
 to YES by default for every jail in
 .Va jail_list .
 .It Va jail_procfs_enable
@@ -3075,57 +3075,57 @@ by default.
 When set to
 .Dq Li YES ,
 sets
-.Va jail_ Ns Ao Ar jid Ac Ns Va _fdescfs_enable
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
 to YES by default for every jail in
 .Va jail_list .
 .It Va jail_exec_start
 .Pq Vt str
 Unset by default.
 When set, use as default value for
-.Va jail_ Ns Ao Ar jid Ac Ns Va _exec_start
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start
 for every jail in 
 .Va jail_list .
 .It Va jail_exec_stop
 Unset by default.
 When set, use as default value for
-.Va jail_ Ns Ao Ar jid Ac Ns Va _exec_stop
+.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
 for every jail in
 .Va jail_list .
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _rootdir
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _rootdir
 .Pq Vt str
 Unset by default.
 Set to the root directory used by jail
-.Va jid .
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _hostname
+.Va jname .
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _hostname
 .Pq Vt str
 Unset by default.
 Set to the fully qualified domain name (FQDN) assigned to jail
-.Va jid .
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _ip
+.Va jname .
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _ip
 .Pq Vt str
 Unset by default.
 Set to the IP address assigned to jail
-.Va jid .
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _flags
+.Va jname .
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _flags
 .Pq Vt str
 Set to
 .Dq Li -l -U root
 by default.
 These are flags to pass to
 .Xr jail .
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _interface
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _interface
 .Pq Vt str
 Unset by default.
 When set, sets the interface to use when setting IP address alias.
 Note that the alias is created at jail startup and removed at jail shutdown.
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _fstab
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
 .Pq Vt str
 Set to
-.Pa /etc/fstab. Ns Ao Ar jid Ac
+.Pa /etc/fstab. Ns Ao Ar jname Ac
 by default.
 This is the file system information file to use for jail
-.Va jid .
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _mount_enable
+.Va jname .
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _mount_enable
 .Pq Vt bool
 Set to
 .Dq Li NO
@@ -3133,14 +3133,14 @@ by default.
 When set to
 .Dq Li YES ,
 mount all file systems from
-.Va jail_ Ns Ao Ar jid Ac Ns Va _fstab
+.Va jail_ Ns Ao Ar jname Ac Ns Va _fstab
 at jail startup.
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _devfs_ruleset
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_ruleset
 .Pq Vt str
 Unset by default.
 When set, defines the device file system ruleset file to use for jail
-.Va jid .
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _devfs_enable
+.Va jname .
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _devfs_enable
 .Pq Vt bool
 Set to
 .Dq Li NO
@@ -3148,9 +3148,9 @@ by default.
 When set to
 .Dq Li YES ,
 mount the device file system inside jail
-.Ar jid
+.Ar jname
 at jail startup.
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _fdescfs_enable
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _fdescfs_enable
 .Pq Vt bool
 Set to
 .Dq Li NO
@@ -3158,9 +3158,9 @@ by default.
 When set to
 .Dq Li YES ,
 mount the file-descriptor file system inside jail
-.Ar jid
+.Ar jname
 at jail startup.
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _procfs_enable
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _procfs_enable
 .Pq Vt bool
 Set to
 .Dq Li NO
@@ -3168,15 +3168,15 @@ by default.
 When set to
 .Dq Li YES ,
 mount the process file system inside jail
-.Ar jid
+.Ar jname
 at jail startup.
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _exec_start
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_start
 .Pq Vt str
 Set to
 .Dq Li /bin/sh /etc/rc
 by default.
 This is the command executed at jail startup.
-.It Va jail_ Ns Ao Ar jid Ac Ns Va _exec_stop
+.It Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
 .Pq Vt str
 Set to
 .Dq Li /bin/sh /etc/rc.shutdown