lxc-alpine: add hwaddr for a single macvlan interface

We already add harware address for a single veth interface. Do the same with a single macvlan interface. Signed-off-by: Natanael Copa <ncopa@alpinelinux.org> Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>

lxc-alpine: add hwaddr for a single macvlan interface
75b55352 · Natanael Copa · Serge Hallyn · e34b5d2e · 75b55352
Commit 75b55352 authored Sep 04, 2013 by Natanael Copa Committed by Serge Hallyn Sep 04, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

lxc-alpine.in templates/lxc-alpine.in +5 -3

No files found.
--- a/templates/lxc-alpine.in
+++ b/templates/lxc-alpine.in
@@ -173,9 +173,11 @@ lxc.network.flags = up
 EOF
    fi
-    # if there is exactly one veth network entry, make sure it has an
+    # if there is exactly one veth or macvlan network entry, make sure
-    # associated mac address.
+    # it has an associated mac address.
-    nics=$(grep -e '^lxc\.network\.type[ \t]*=[ \t]*veth' $path/config | wc -l)
+    nics=$(awk -F '[ \t]*=[ \t]*' \
+        '$1=="lxc.network.type" && ($2=="veth" || $2=="macvlan") {print $2}' \
+        $path/config | wc -l)
    if [ "$nics" -eq 1 ] && ! grep -q "^lxc.network.hwaddr" $path/config; then
        # see http://sourceforge.net/tracker/?func=detail&aid=3411497&group_id=163076&atid=826303
        hwaddr="fe:$(dd if=/dev/urandom bs=8 count=1 2>/dev/null |od -t x8 | \