diff options
author | Dirk von Suchodoletz | 2009-04-03 18:12:18 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2009-04-03 18:12:18 +0200 |
commit | 70b81e5ff5ed98c175ed31826e22c423c00d539d (patch) | |
tree | 3f9eedc26d50afdd11b40aca469a236d753ce6b0 | |
parent | Bugfix forgot semicolon and to remove copy of menu.c32 (diff) | |
download | core-70b81e5ff5ed98c175ed31826e22c423c00d539d.tar.gz core-70b81e5ff5ed98c175ed31826e22c423c00d539d.tar.xz core-70b81e5ff5ed98c175ed31826e22c423c00d539d.zip |
Small nasty bug with brtcl stp off/0 ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2798 95ad53e4-c205-0410-b2fa-d234c58c8868
4 files changed, 22 insertions, 5 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-9.04 b/initramfs/distro-specs/ubuntu/functions-9.04 new file mode 100644 index 00000000..a5461d31 --- /dev/null +++ b/initramfs/distro-specs/ubuntu/functions-9.04 @@ -0,0 +1,17 @@ +# Copyright (c) 2003..2006 - RZ Uni Freiburg +# Copyright (c) 2006..2009 - OpenSLX GmbH +# +# This program/file is free software distributed under the GPL version 2. +# See http://openslx.org/COPYING +# +# If you have any feedback please consult http://openslx.org/feedback and +# send your feedback to feedback@openslx.org +# +# General information about OpenSLX can be found under http://openslx.org +# +# Configuration script for Ubuntu 9.04 configure OpenSLX linux stateless +# clients (merged in stage2 with ubuntu/functions-default - and loaded within +# initial ramfs - stage3) It may overwrite settings from the default config +# file (/etc/functions) + +# no changes from default diff --git a/os-plugins/plugins/qemukvm/init-hooks/20-nw-bridge-config/bridge.sh b/os-plugins/plugins/qemukvm/init-hooks/20-nw-bridge-config/bridge.sh index c0b8bd31..6aabe8ad 100644 --- a/os-plugins/plugins/qemukvm/init-hooks/20-nw-bridge-config/bridge.sh +++ b/os-plugins/plugins/qemukvm/init-hooks/20-nw-bridge-config/bridge.sh @@ -10,7 +10,7 @@ # 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 virtualbox plugins) +# (should be kept identical to the files of virtualbox and qemukvm plugins) ############################################################################# local bridge=br0 @@ -19,7 +19,7 @@ local nwifmac=${macaddr} # bridge 0 already defined or some other problem brctl addbr ${bridge} || exit 0 -brctl stp ${bridge} off +brctl stp ${bridge} 0 brctl setfd ${bridge} 0.000000000001 ip link set addr ${nwifmac} ${bridge} ip link set dev ${nwif} up 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 f570147b..6aabe8ad 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,7 +10,7 @@ # 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) +# (should be kept identical to the files of virtualbox and qemukvm plugins) ############################################################################# local bridge=br0 @@ -19,7 +19,7 @@ local nwifmac=${macaddr} # bridge 0 already defined or some other problem brctl addbr ${bridge} || exit 0 -brctl stp ${bridge} off +brctl stp ${bridge} 0 brctl setfd ${bridge} 0.000000000001 ip link set addr ${nwifmac} ${bridge} ip link set dev ${nwif} up diff --git a/os-plugins/plugins/vmware/init-hooks/20-nw-bridge-config/bridge.sh b/os-plugins/plugins/vmware/init-hooks/20-nw-bridge-config/bridge.sh index dad86337..6aabe8ad 100755 --- a/os-plugins/plugins/vmware/init-hooks/20-nw-bridge-config/bridge.sh +++ b/os-plugins/plugins/vmware/init-hooks/20-nw-bridge-config/bridge.sh @@ -19,7 +19,7 @@ local nwifmac=${macaddr} # bridge 0 already defined or some other problem brctl addbr ${bridge} || exit 0 -brctl stp ${bridge} off +brctl stp ${bridge} 0 brctl setfd ${bridge} 0.000000000001 ip link set addr ${nwifmac} ${bridge} ip link set dev ${nwif} up |