■

修正

# NOTES:
# - replace 'example' with the jail's name.
# - except rootdir, hostname and ip, all of the following variables may be made
#   global jail variables if you don't specify a jail name (ie. jail_interface).

追加

#jail_example_interface=""

Interface to create the IP alias on

commit log

MFC:

• 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]

src/share/man/man5/

freebsd:keyword:rc.conf">rc.conf.5: rev 1.293 -> 1.294

src/etc/rc.d/jail

rev 1.31 -> 1.32

src/etc/defaults/

freebsd:keyword:rc.conf">rc.conf: rev 1.282 -> 1.283

Reported by

pjd [1], clsung [2]

$FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.21 2006/06/06 15:04:39 flz Exp $

■

追加

ntpd_config="/etc/ntp.conf"

ntpd(8) configuration file

commit log

MFC:

• Add new ntpd_config variable so that people can override it in rc.conf.
• Add default value in /etc/defaults/rc.conf.
• Add documentation bits to rc.conf(5).

src/etc/rc.d/ntpd

rev 1.12 -> 1.13

src/share/man/man5/

freebsd:keyword:rc.conf">rc.conf.5:rev 1.292 -> 1.293

src/etc/defaults/

freebsd:keyword:rc.conf">rc.conf:rev 1.280 -> 1.281

$FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.20 2006/06/06 11:17:09 flz Exp $

■

追加

amd_program="/usr/sbin/amd"

path to amd, if you want a different one.

commit log

MFC:

• Fix amd startup when amd is installed from ports.
• Add the according amd_program default value in defaults.

src/etc/rc.d/amd

rev 1.16 -> 1.17

src/etc/defaults/

freebsd:keyword:rc.conf">rc.conf:rev 1.277 -> 1.278

PR

conf/82738

Submitted by

TAOKA Fumiyoshi

$FreeBSD: src/etc/defaults/rc.conf,v 1.252.2.19 2006/06/06 09:47:09 flz Exp $