diff options
| author | Simon Rettberg | 2017-12-21 14:33:27 +0100 |
|---|---|---|
| committer | Your Name | 2017-12-21 14:33:27 +0100 |
| commit | f8cb6a72355f239a00da14fe89e628db4084bf63 (patch) | |
| tree | 7e26637d4c96501661647c585c95805aec074c0c /core | |
| parent | kernelconfig: Disable CONFIG_SPI_INTEL_SPI_PLATFORM (diff) | |
| download | mltk-f8cb6a72355f239a00da14fe89e628db4084bf63.tar.gz mltk-f8cb6a72355f239a00da14fe89e628db4084bf63.tar.xz mltk-f8cb6a72355f239a00da14fe89e628db4084bf63.zip | |
[vmware12/rfs-stage31] Fix jumbo frame support (get config first, then read value)
Diffstat (limited to 'core')
3 files changed, 8 insertions, 1 deletions
diff --git a/core/modules/vmware12/data/opt/openslx/scripts/systemd-vmware_env b/core/modules/vmware12/data/opt/openslx/scripts/systemd-vmware_env index a74fd106..ff4d58c5 100755 --- a/core/modules/vmware12/data/opt/openslx/scripts/systemd-vmware_env +++ b/core/modules/vmware12/data/opt/openslx/scripts/systemd-vmware_env @@ -63,6 +63,8 @@ vmnetif () { for vmnet in 0 1 2; do 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 # setup bridge (vmnet0), nat (vmnet1) and software defined networking (vmnet2) interfaces brctl addif br0 vmnet0 brctl addif nat1 vmnet1 diff --git a/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig b/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig index 79596646..3f109408 100644 --- a/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig +++ b/core/rootfs/rootfs-stage31/data/inc/activate_sysconfig @@ -140,5 +140,11 @@ if [ -n "$SLX_SYSTEMD_TARGET" ]; then done fi +# Activate jumbo frames if requested +( + . /run/network.conf + [ -n "$IFACE" ] && [ "x$SLX_JUMBO_FRAMES" = "xyes" ] && ip link set dev "$IFACE" mtu 9000 +) + true diff --git a/core/rootfs/rootfs-stage31/data/inc/setup_network b/core/rootfs/rootfs-stage31/data/inc/setup_network index 25a5e275..897469cc 100644 --- a/core/rootfs/rootfs-stage31/data/inc/setup_network +++ b/core/rootfs/rootfs-stage31/data/inc/setup_network @@ -54,7 +54,6 @@ for LINE in $IP_OUT; do brctl setfd "$BRIDGE" 0.000000000001 ip link set addr "$IFMAC" "$BRIDGE" || drop_shell "Could not set mac of $BRIDGE" ip link set dev "$IFACE" up - [ "x$SLX_JUMBO_FRAMES" = "xyes" ] && ip link set dev "$IFACE" mtu 9000 wait_for_iface "$IFACE" brctl addif "$BRIDGE" "$IFACE" || drop_shell "Could not add $IFACE to $BRIDGE" |