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

[Jase Thew]

On 15/10/2013 05:54, Hiroki Sato wrote:
> Author: hrs
> Date: Tue Oct 15 04:54:49 2013
> New Revision: 256498
> URL: http://svnweb.freebsd.org/changeset/base/256498
> 
> Log:
>   - Fix "ifname|addr" syntax support in jail_{jname}_ip.
>   - Create /var/run/jail_{jname}.id because ezjail-admin depends on it.
> 
> Modified:
>   head/etc/rc.d/jail
> 

Hi Hiroki,

This unfortunately breaks ezjail when the address list doesn't use iface
prefix syntax.

Given this configuration :

export jail_poudriere_ip="192.168.1.184,127.0.1.4,::1"

results in the following being generated :

ip4.addr += "|192.168.1.184/32";
ip4.addr += "|127.0.1.4/32";
ip6.addr += "|::1/64";

The attach patch corrects the issue by suffixing the iface value with
"|" only when it has a value.

Kind regards,

Jase.
-- 
Jase Thew
jase at FreeBSD.org
FreeBSD Ports Committer

-------------- next part --------------
--- /etc/rc.d/jail.orig	2013-10-18 17:47:58.523869030 +0100
+++ /etc/rc.d/jail	2013-10-18 18:18:36.859220800 +0100
@@ -367,10 +367,10 @@
 		# Append address to list of addresses for the jail command.
 		case $_type in
 		inet)
-			echo "	ip4.addr += \"${_iface}|${_addr}${_mask}\";"
+			echo "	ip4.addr += \"${_iface:+${_iface}|}${_addr}${_mask}\";"
 		;;
 		inet6)
-			echo "	ip6.addr += \"${_iface}|${_addr}${_mask}\";"
+			echo "	ip6.addr += \"${_iface:+${_iface}|}${_addr}${_mask}\";"
 			need_dad_wait=1
 		;;
 		esac
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 1029 bytes
Desc: OpenPGP digital signature
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20131018/9deaca96/attachment.sig>