Small fixes for the bridge configuration. Automatic adding of the bridge

module as Michael suggested. Changing the VERSIONS to be in line with the
movements towards stable version 5 (latter one is branched, the trunk will
run for 5.1 from now on ...)


git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2666 95ad53e4-c205-0410-b2fa-d234c58c8868

1 files changed, 4 insertions, 4 deletions

diff --git a/os-plugins/plugins/virtualbox/init-hooks/20-nw-bridge-config/bridge.sh b/os-plugins/plugins/virtualbox/init-hooks/20-nw-bridge-config/bridge.sh
index 7503e3ab..f570147b 100644
--- a/os-plugins/plugins/virtualbox/init-hooks/20-nw-bridge-config/bridge.sh
+++ b/os-plugins/plugins/virtualbox/init-hooks/20-nw-bridge-config/bridge.sh
@@ -10,10 +10,9 @@
 # General information about OpenSLX can be found at http://openslx.org
 #
 # Init hook to create a bridge on the active network interface
+# (should be kept identical to the files of vmware and qemukvm plugins)
 #############################################################################
 
-set -x
-
 local bridge=br0
 local brnwif=${nwif}
 local nwifmac=${macaddr}
@@ -22,9 +21,10 @@ local nwifmac=${macaddr}
 brctl addbr ${bridge} || exit 0
 brctl stp ${bridge} off
 brctl setfd ${bridge} 0.000000000001
-ip link set addr ${nwifmac} br0
+ip link set addr ${nwifmac} ${bridge}
 ip link set dev ${nwif} up
 brctl addif ${bridge} ${nwif}
 
-# fixme: sending back the variable to init does not work properly at the moment
+# fixme: sending back the variable to init does not work properly at the
+# moment
 nwif=${bridge}