X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-bridge.sh;h=b0e3658e121c6fbfbb5e23e0b43b7d7eee34011e;hb=490c515a3229ba59e13d501371460828644f031a;hp=ecee98b52d92fe732326a5aad0bf2c7248712628;hpb=b4dcf590f6c1aaaf3f4d508dfa207ed5fed6851e;p=build.git diff --git a/lbuild-bridge.sh b/lbuild-bridge.sh index ecee98b5..b0e3658e 100755 --- a/lbuild-bridge.sh +++ b/lbuild-bridge.sh @@ -22,13 +22,14 @@ for line in file("/proc/net/dev"): if ifname.find("virbr")==0: continue if ifname.find("veth")==0: continue if ifname.find("tap")==0: continue + if ifname.find("vif")==0: continue print ifname EOF } function discover_interface () { for ifname in $(gather_interfaces); do - ip link show $ifname | grep -qi 'state UP' && { echo $ifname; return; } + ip link show $ifname | grep -qi 'state UP' && { echo $ifname; return; } done # still not found ? that's bad echo unknown @@ -56,8 +57,8 @@ function create_bridge_if_needed() { # already created ? - we're done ip addr show $public_bridge >& /dev/null && { - echo "Bridge already set up - skipping create_bridge_if_needed" - return 0 + echo "Bridge already set up - skipping create_bridge_if_needed" + return 0 } # find out the physical interface to bridge onto @@ -136,9 +137,9 @@ function create_bridge_if_needed() { function main () { if [[ -n "$@" ]] ; then - public_bridge="$1"; shift + public_bridge="$1"; shift else - public_bridge="$DEFAULT_PUBLIC_BRIDGE" + public_bridge="$DEFAULT_PUBLIC_BRIDGE" fi create_bridge_if_needed $public_bridge }