From 6a92dbbad3359a262115341e6b7c1430195ddd00 Mon Sep 17 00:00:00 2001 From: Gurucharan Shetty Date: Mon, 11 Apr 2016 08:23:43 -0700 Subject: ovs-save: Handle MTU changes correctly. The following command on ubuntu 12.04, 14.04 and CentOS 7.x returns null: expr "mtu 1500" : '.*mtu \([0-9]+\)' But the following works correctly: expr "mtu 1500" : '.*mtu \([0-9]\+\)' I am not sure about the portability implications as there seems to be very sparse documentation about this but this fixes a bug in 2 of the most popular distributions. VMware-BZ: #1638654 Signed-off-by: Gurucharan Shetty --- utilities/ovs-save | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utilities/ovs-save b/utilities/ovs-save index c96501d28..8e24f537f 100755 --- a/utilities/ovs-save +++ b/utilities/ovs-save @@ -61,7 +61,7 @@ save_interfaces () { if expr "$state" : '.*\bdynamic\b' > /dev/null; then linkcmd="$linkcmd dynamic" fi - if qlen=`expr "$state" : '.*qlen \([0-9]+\)'`; then + if qlen=`expr "$state" : '.*qlen \([0-9]\+\)'`; then linkcmd="$linkcmd txqueuelen $qlen" fi if hwaddr=`expr "$state" : '.*link/ether \([^ ]*\)'`; then @@ -70,7 +70,7 @@ save_interfaces () { if brd=`expr "$state" : '.*brd \([^ ]*\)'`; then linkcmd="$linkcmd broadcast $brd" fi - if mtu=`expr "$state" : '.*mtu \([0-9]+\)'`; then + if mtu=`expr "$state" : '.*mtu \([0-9]\+\)'`; then linkcmd="$linkcmd mtu $mtu" fi if test -n "$linkcmd"; then -- cgit v1.2.1