From owner-svn-src-all@freebsd.org  Mon Feb  8 17:47:38 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 4705EAA23B0;
 Mon,  8 Feb 2016 17:47:38 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 13F461E46;
 Mon,  8 Feb 2016 17:47:38 +0000 (UTC)
 (envelope-from dteske@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u18Hlb1b073799;
 Mon, 8 Feb 2016 17:47:37 GMT (envelope-from dteske@FreeBSD.org)
Received: (from dteske@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u18HlaI6073797;
 Mon, 8 Feb 2016 17:47:36 GMT (envelope-from dteske@FreeBSD.org)
Message-Id: <201602081747.u18HlaI6073797@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: dteske set sender to
 dteske@FreeBSD.org using -f
From: Devin Teske <dteske@FreeBSD.org>
Date: Mon, 8 Feb 2016 17:47:36 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r295401 - head/share/examples/jails
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Feb 2016 17:47:38 -0000

Author: dteske
Date: Mon Feb  8 17:47:36 2016
New Revision: 295401
URL: https://svnweb.freebsd.org/changeset/base/295401

Log:
  Adjust MAC allocation algo to support layering

Modified:
  head/share/examples/jails/jib
  head/share/examples/jails/jng

Modified: head/share/examples/jails/jib
==============================================================================
--- head/share/examples/jails/jib	Mon Feb  8 17:36:46 2016	(r295400)
+++ head/share/examples/jails/jib	Mon Feb  8 17:47:36 2016	(r295401)
@@ -267,8 +267,15 @@ jib_addm()
 		10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
 		13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
 		esac
-		eiface_devid_a=2:$quad$eiface_devid_a
-		eiface_devid_b=6:$quad$eiface_devid_b
+		case "$iface_devid" in
+		?2:*|?6:*)
+			eiface_devid_a=a:$quad$eiface_devid_a
+			eiface_devid_b=e:$quad$eiface_devid_b
+			;;
+		*)
+			eiface_devid_a=2:$quad$eiface_devid_a
+			eiface_devid_b=6:$quad$eiface_devid_b
+		esac
 		num=$(( $num >> 4 ))
 		quad=$(( $num & 15 ))
 		case "$quad" in

Modified: head/share/examples/jails/jng
==============================================================================
--- head/share/examples/jails/jng	Mon Feb  8 17:36:46 2016	(r295400)
+++ head/share/examples/jails/jng	Mon Feb  8 17:47:36 2016	(r295401)
@@ -297,7 +297,10 @@ jng_bridge()
 		10) quad=a ;; 11) quad=b ;; 12) quad=c ;;
 		13) quad=d ;; 14) quad=e ;; 15) quad=f ;;
 		esac
-		eiface_devid=2:$quad$eiface_devid
+		case "$iface_devid" in
+		?2:*) eiface_devid=a:$quad$eiface_devid ;;
+		*) eiface_devid=2:$quad$eiface_devid
+		esac
 		num=$(( $num >> 4 ))
 		quad=$(( $num & 15 ))
 		case "$quad" in