diff options
| author | dteske <dteske@FreeBSD.org> | 2016-02-08 17:47:36 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2016-02-08 17:47:36 +0000 |
| commit | 42bcd86bfbff24f6d52e96805b6d8d535c7db051 (patch) | |
| tree | 8a73f0b06d4ae6932035fa8772317714f434fab4 | |
| parent | c0df6398dde663e43d0e366aee9a1f5dd36e1eb0 (diff) | |
| download | FreeBSD-src-42bcd86bfbff24f6d52e96805b6d8d535c7db051.zip FreeBSD-src-42bcd86bfbff24f6d52e96805b6d8d535c7db051.tar.gz | |
Adjust MAC allocation algo to support layering
| -rwxr-xr-x | share/examples/jails/jib | 11 | ||||
| -rwxr-xr-x | share/examples/jails/jng | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/share/examples/jails/jib b/share/examples/jails/jib index e48f5c4..890c168 100755 --- a/share/examples/jails/jib +++ b/share/examples/jails/jib @@ -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 diff --git a/share/examples/jails/jng b/share/examples/jails/jng index bb63cd67..0d9132e 100755 --- a/share/examples/jails/jng +++ b/share/examples/jails/jng @@ -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 |
