svn commit: r243080 - head/etc/rc.d

[Eitan Adler]

Author: eadler
Date: Thu Nov 15 15:06:15 2012
New Revision: 243080
URL: http://svnweb.freebsd.org/changeset/base/243080

Log:
  Only pass ip[46].addr when _addrl contains a value
  
  Submitted by:	crees
  Reviewed by:	Mike Jakubik <mike.jakubik at intertainservices.com>
  Approved by:	cperciva
  MFC after:	2 weeks

Modified:
  head/etc/rc.d/jail

Modified: head/etc/rc.d/jail
==============================================================================
--- head/etc/rc.d/jail	Thu Nov 15 15:06:12 2012	(r243079)
+++ head/etc/rc.d/jail	Thu Nov 15 15:06:15 2012	(r243080)
@@ -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
_______________________________________________
svn-src-all at freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"