Mailing List Archive

Author: Antonio Borneo
Date: Sat Apr 21 17:56:11 2012
New Revision: 517

Log:
Fix compatibility with Solaris 10 /bin/sh

It doesn't support $( ) or $(( )) or [ -e ] or if !

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>

Modified:
branches/vpnc-nortel/vpnc-script
trunk/vpnc-script

Modified: branches/vpnc-nortel/vpnc-script
==============================================================================
--- branches/vpnc-nortel/vpnc-script (original)
+++ branches/vpnc-nortel/vpnc-script Sat Apr 21 17:56:11 2012
@@ -108,10 +108,10 @@
if [ -n "$INTERNAL_IP4_MTU" ]; then
MTU=$INTERNAL_IP4_MTU
elif [ -n "$IPROUTE" ]; then
- MTUDEV=$($IPROUTE route get "$VPNGATEWAY" | sed -ne 's/^.*dev \([a-z0-9]*\).*$/\1/p')
- MTU=$($IPROUTE link show "$MTUDEV" | sed -ne 's/^.*mtu \([[:digit:]]\+\).*$/\1/p')
+ MTUDEV=`$IPROUTE route get "$VPNGATEWAY" | sed -ne 's/^.*dev \([a-z0-9]*\).*$/\1/p'`
+ MTU=`$IPROUTE link show "$MTUDEV" | sed -ne 's/^.*mtu \([[:digit:]]\+\).*$/\1/p'`
if [ -n "$MTU" ]; then
- MTU=$(( $MTU - 88 ))
+ MTU=`expr $MTU - 88`
fi
fi

@@ -417,7 +417,7 @@
}

restore_resolvconf_generic() {
- if [ ! -e "$RESOLV_CONF_BACKUP" ]; then
+ if [ ! -f "$RESOLV_CONF_BACKUP" ]; then
return
fi
grep '^#@VPNC_GENERATED@' /etc/resolv.conf > /dev/null 2>&1 && cat "$RESOLV_CONF_BACKUP" > /etc/resolv.conf
@@ -579,9 +579,8 @@
i=`expr $i + 1`
done
for i in $INTERNAL_IP4_DNS ; do
- if ! echo "$i" | grep : >/dev/null; then
+ echo "$i" | grep : >/dev/null || \
set_network_route "$i" "255.255.255.255" "32"
- fi
done
elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then
set_default_route

Modified: trunk/vpnc-script
==============================================================================
--- trunk/vpnc-script (original)
+++ trunk/vpnc-script Sat Apr 21 17:56:11 2012
@@ -108,10 +108,10 @@
if [ -n "$INTERNAL_IP4_MTU" ]; then
MTU=$INTERNAL_IP4_MTU
elif [ -n "$IPROUTE" ]; then
- MTUDEV=$($IPROUTE route get "$VPNGATEWAY" | sed -ne 's/^.*dev \([a-z0-9]*\).*$/\1/p')
- MTU=$($IPROUTE link show "$MTUDEV" | sed -ne 's/^.*mtu \([[:digit:]]\+\).*$/\1/p')
+ MTUDEV=`$IPROUTE route get "$VPNGATEWAY" | sed -ne 's/^.*dev \([a-z0-9]*\).*$/\1/p'`
+ MTU=`$IPROUTE link show "$MTUDEV" | sed -ne 's/^.*mtu \([[:digit:]]\+\).*$/\1/p'`
if [ -n "$MTU" ]; then
- MTU=$(( $MTU - 88 ))
+ MTU=`expr $MTU - 88`
fi
fi

@@ -417,7 +417,7 @@
}

restore_resolvconf_generic() {
- if [ ! -e "$RESOLV_CONF_BACKUP" ]; then
+ if [ ! -f "$RESOLV_CONF_BACKUP" ]; then
return
fi
grep '^#@VPNC_GENERATED@' /etc/resolv.conf > /dev/null 2>&1 && cat "$RESOLV_CONF_BACKUP" > /etc/resolv.conf
@@ -579,9 +579,8 @@
i=`expr $i + 1`
done
for i in $INTERNAL_IP4_DNS ; do
- if ! echo "$i" | grep : >/dev/null; then
+ echo "$i" | grep : >/dev/null || \
set_network_route "$i" "255.255.255.255" "32"
- fi
done
elif [ -n "$INTERNAL_IP4_ADDRESS" ]; then
set_default_route

_______________________________________________
vpnc-devel mailing list
vpnc-devel@unix-ag.uni-kl.de
https://lists.unix-ag.uni-kl.de/mailman/listinfo/vpnc-devel
http://www.unix-ag.uni-kl.de/~massar/vpnc/