aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2013-02-12 08:49:50 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2013-02-12 08:50:35 +0000
commit0e1e087322b10ded282638c8d25a62a2c1ce18e3 (patch)
tree6ce3252e5d5685db1fac6a13fbb901e426023cd1 /main
parent7b13245abef94443d4a7e45bb6e734e243057274 (diff)
downloadaports-0e1e087322b10ded282638c8d25a62a2c1ce18e3.tar.bz2
aports-0e1e087322b10ded282638c8d25a62a2c1ce18e3.tar.xz
main/bridge: support bridges without any ports added
Useful for virtualization
Diffstat (limited to 'main')
-rw-r--r--main/bridge/APKBUILD6
-rwxr-xr-xmain/bridge/bridge.pre-up5
2 files changed, 7 insertions, 4 deletions
diff --git a/main/bridge/APKBUILD b/main/bridge/APKBUILD
index f60850b157..749ba8e272 100644
--- a/main/bridge/APKBUILD
+++ b/main/bridge/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=bridge
pkgver=1.5
-pkgrel=2
+pkgrel=3
pkgdesc="Scripts for configuring network bridge interfaces"
url="http://wiki.alpinelinux.org/wiki/Bridge"
arch="noarch"
@@ -36,4 +36,6 @@ package() {
ln -s ../if-pre-up.d/bridge "$pkgdir"/etc/network/if-post-down.d/bridge
}
-md5sums="937365c4a3e3e10f51116c7e6717f434 bridge.pre-up"
+md5sums="ea889dea323d690521228cb88f804c97 bridge.pre-up"
+sha256sums="80e506e5fd79ab70a86d8166e725dbdafbcff9b5333f8a09a2f8c0c55d4a3591 bridge.pre-up"
+sha512sums="b7ee7193b15d44f4055d51ff83a26cdbf4977f8c319473db923a9f4c175ca883a31408114cd19f479eacb980e8850aa29b5dfbe0dd17782c510a0f2bf9b5b244 bridge.pre-up"
diff --git a/main/bridge/bridge.pre-up b/main/bridge/bridge.pre-up
index 995e258883..997bb74f2c 100755
--- a/main/bridge/bridge.pre-up
+++ b/main/bridge/bridge.pre-up
@@ -122,10 +122,11 @@ all) PORTS=$(all_ports);;
*) PORTS="$IF_BRIDGE_PORTS";;
esac
-[ -z "$PORTS" ] && exit
+[ -z "$PORTS" ] && ! env | grep -q "^IF_BRIDGE" && exit
+
case "$MODE" in
-start)
+start)
brctl addbr $IFACE || exit 1
wait_ports
set_bridge_opts