summaryrefslogtreecommitdiffstats
path: root/core/modules/vmware-common
diff options
context:
space:
mode:
authorSimon Rettberg2022-02-21 18:25:18 +0100
committerSimon Rettberg2022-02-21 18:25:18 +0100
commit67bfedfe52ed2063ba3f0bff1cb71b1e807f4b89 (patch)
tree62d1ace8873b07b043b8784982d78f6b43ab4344 /core/modules/vmware-common
parent[debug-report-bwlp] Add brctl show (diff)
downloadmltk-67bfedfe52ed2063ba3f0bff1cb71b1e807f4b89.tar.gz
mltk-67bfedfe52ed2063ba3f0bff1cb71b1e807f4b89.tar.xz
mltk-67bfedfe52ed2063ba3f0bff1cb71b1e807f4b89.zip
[dhcp-busybox] Add service to create additional bridges
Diffstat (limited to 'core/modules/vmware-common')
-rwxr-xr-xcore/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env9
1 files changed, 4 insertions, 5 deletions
diff --git a/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env b/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env
index d54b66af..4e7875db 100755
--- a/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env
+++ b/core/modules/vmware-common/data/opt/openslx/scripts/systemd-vmware_env
@@ -66,15 +66,14 @@ vmnetif () {
vmnet_create "$vmnet"
done
# Set the vmware interface to 9000 too, as br0 will use the smallest of all slave devices
- [ "x$SLX_JUMBO_FRAMES" = "xyes" ] && ip link set dev vmnet0 mtu 9000
+ [ "$SLX_JUMBO_FRAMES" = "yes" ] && ip link set dev vmnet0 mtu 9000
# setup bridge (vmnet0), nat (vmnet1) and software defined networking (vmnet2) interfaces
brctl addif br0 vmnet0
brctl addif nat1 vmnet1
brctl addif vsw2 vmnet2
# 2) see if we should bridge additional interfaces
- NICS=
if [ "$SLX_BRIDGE_OTHER_NICS" = "yes" ]; then
- # These will have been set up in our init
+ # These will have been set up in our init, or by bridge-other-nics.service
NICS=$( ls -1 /sys/class/net | grep '^br-nic-' | cut -c 8- )
vmnet=10
for nic in $NICS; do
@@ -88,8 +87,8 @@ vmnetif () {
vmnet="$(( vmnet + 1 ))"
done
fi
- # Printergui rules etc.
- systemctl --no-block restart openslx-iptables.service
+ # trigger reload of iptables stuff (it's using inotify)
+ touch /opt/openslx/iptables/rules.d/empty
}
vmblock () {