Attachment #87633 for bug #124248

View | Details | Raw Unified | Return to bug 124248
Collapse All | Expand All

Lines 605-610 Link Here

(-)etc/defaults/rc.conf (+1 lines)
605	#jail_example_devfs_ruleset="ruleset_name" # devfs ruleset to apply to jail	605	#jail_example_devfs_ruleset="ruleset_name" # devfs ruleset to apply to jail
606	#jail_example_fstab="" # fstab(5) for mount/umount	606	#jail_example_fstab="" # fstab(5) for mount/umount
607	#jail_example_flags="-l -U root" # flags for jail(8)	607	#jail_example_flags="-l -U root" # flags for jail(8)
		608	#jail_example_nice="5" # nice(1) for jail execution
608		609
609	##############################################################	610	##############################################################
610	### Define source_rc_confs, the mechanism used by /etc/rc.* ##	611	### Define source_rc_confs, the mechanism used by /etc/rc.* ##




	[ -z "${_flags}" ] && _flags="-l -U root"
	eval _consolelog=\"\${jail_${_j}_consolelog:-${jail_consolelog}}\"
	[ -z "${_consolelog}" ] && _consolelog="/var/log/jail_${_j}_console.log"
	eval _nice=\"\${jail_${_j}_nice:-${jail_nice}}\"

	# Debugging aid
	#

	debug "$_j exec stop: $_exec_stop"
	debug "$_j flags: $_flags"
	debug "$_j consolelog: $_consolelog"
	debug "$_j nice: $_nice"

	if [ -z "${_hostname}" ]; then
		err 3 "$name: No hostname has been defined for ${_j}"

			fi
		fi
		_tmp_jail=${_tmp_dir}/jail.$$

		if [ -z "${_nice}" ]; then 
			_nice_cmd=""
		else
			_nice_cmd="nice -n ${_nice}"
		fi

		eval ${_nice_cmd} jail ${_flags} -i ${_rootdir} ${_hostname} \
			${_ip} ${_exec_start} > ${_tmp_jail} 2>&1

		if [ "$?" -eq 0 ] ; then

Lines 3312-3317 Link Here

(-)usr/src/share/man/man5/rc.conf.5 (+12 lines)
3312	.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop	3312	.Va jail_ Ns Ao Ar jname Ac Ns Va _exec_stop
3313	for every jail in	3313	for every jail in
3314	.Va jail_list .	3314	.Va jail_list .
		3315	.It Va jail_nice
		3316	.Pq Vt int
		3317	Unset by default.
		3318	When set, use as default value for
		3319	.Va jail_ Ns Ao Ar jname Ac Ns Va _nice
		3320	for every jail in
		3321	.Va jail_list .
3315	.It Va jail_ Ns Ao Ar jname Ac Ns Va _rootdir	3322	.It Va jail_ Ns Ao Ar jname Ac Ns Va _rootdir
3316	.Pq Vt str	3323	.Pq Vt str
3317	Unset by default.	3324	Unset by default.
Lines 3412-3417 Link Here
3412	.Dq Li /bin/sh /etc/rc.shutdown	3419	.Dq Li /bin/sh /etc/rc.shutdown
3413	by default.	3420	by default.
3414	This is the command executed at jail shutdown.	3421	This is the command executed at jail shutdown.
		3422	.It Va jail_ Ns Ao Ar jname Ac Ns Va _nice
		3423	.Pq Vt int
		3424	Unset by default.
		3425	When set, sets the nice value to alter priority of processes in jail.
		3426	The higher the nice value the lower its scheduling priority.
3415	.It Va jail_set_hostname_allow	3427	.It Va jail_set_hostname_allow
3416	.Pq Vt bool	3428	.Pq Vt bool
3417	If set to	3429	If set to

Return to bug 124248

Lines 83-88 Link Here

(-)etc/rc.d/jail (-1 / +10 lines)
83	[ -z "${_flags}" ] && _flags="-l -U root"	83	[ -z "${_flags}" ] && _flags="-l -U root"
84	eval _consolelog=\"\${jail_${_j}_consolelog:-${jail_consolelog}}\"	84	eval _consolelog=\"\${jail_${_j}_consolelog:-${jail_consolelog}}\"
85	[ -z "${_consolelog}" ] && _consolelog="/var/log/jail_${_j}_console.log"	85	[ -z "${_consolelog}" ] && _consolelog="/var/log/jail_${_j}_console.log"
		86	eval _nice=\"\${jail_${_j}_nice:-${jail_nice}}\"
86		87
87	# Debugging aid	88	# Debugging aid
88	#	89	#
Lines 117-122 Link Here
117	debug "$_j exec stop: $_exec_stop"	118	debug "$_j exec stop: $_exec_stop"
118	debug "$_j flags: $_flags"	119	debug "$_j flags: $_flags"
119	debug "$_j consolelog: $_consolelog"	120	debug "$_j consolelog: $_consolelog"
		121	debug "$_j nice: $_nice"
120		122
121	if [ -z "${_hostname}" ]; then	123	if [ -z "${_hostname}" ]; then
122	err 3 "$name: No hostname has been defined for ${_j}"	124	err 3 "$name: No hostname has been defined for ${_j}"
Lines 350-356 Link Here
350	fi	352	fi
351	fi	353	fi
352	_tmp_jail=${_tmp_dir}/jail.$$	354	_tmp_jail=${_tmp_dir}/jail.$$
353	eval jail ${_flags} -i ${_rootdir} ${_hostname} \	355
		356	if [ -z "${_nice}" ]; then
		357	_nice_cmd=""
		358	else
		359	_nice_cmd="nice -n ${_nice}"
		360	fi
		361
		362	eval ${_nice_cmd} jail ${_flags} -i ${_rootdir} ${_hostname} \
354	${_ip} ${_exec_start} > ${_tmp_jail} 2>&1	363	${_ip} ${_exec_start} > ${_tmp_jail} 2>&1
355		364
356	if [ "$?" -eq 0 ] ; then	365	if [ "$?" -eq 0 ] ; then