svn commit: r243757 - stable/9/etc/rc.d

Eitan Adler eadler at FreeBSD.org
Sat Dec 1 16:44:34 UTC 2012


Author: eadler
Date: Sat Dec  1 16:44:33 2012
New Revision: 243757
URL: http://svnweb.freebsd.org/changeset/base/243757

Log:
  MFC r243080:
  	Only pass ip[46].addr when _addrl contains a value
  
  Approved by:	cperciva (implicit)

Modified:
  stable/9/etc/rc.d/jail
Directory Properties:
  stable/9/etc/   (props changed)

Modified: stable/9/etc/rc.d/jail
==============================================================================
--- stable/9/etc/rc.d/jail	Sat Dec  1 15:54:54 2012	(r243756)
+++ stable/9/etc/rc.d/jail	Sat Dec  1 16:44:33 2012	(r243757)
@@ -656,7 +656,8 @@ jail_start()
 		done
 
 		eval ${_setfib} jail -n ${_jail} ${_flags} -i -c path=${_rootdir} host.hostname=${_hostname} \
-			ip4.addr=\"${_addrl}\" ip6.addr=\"${_addr6l}\" ${_parameters} command=${_exec_start} > ${_tmp_jail} 2>&1 \
+			${_addrl:+ip4.addr=\"${_addrl}\"} ${_addr6l:+ip6.addr=\"${_addr6l}\"} \
+			${_parameters} command=${_exec_start} > ${_tmp_jail} 2>&1 \
 			</dev/null
 
 		if [ "$?" -eq 0 ] ; then


More information about the svn-src-all mailing list