diff options
| author | Bill Nottingham <notting@redhat.com> | 2009-07-29 17:26:33 -0400 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2009-07-30 12:24:33 -0400 |
| commit | 1096cd2ebc150e5c74b5e8e4016b835f34cd3f48 (patch) | |
| tree | 5581822887866deec1c54bacb72b732589d0e52f /ppp | |
| parent | 48573c2f689c0b7b0aefcb230ce32a7f0fb9d843 (diff) | |
| download | initscripts-1096cd2ebc150e5c74b5e8e4016b835f34cd3f48.tar initscripts-1096cd2ebc150e5c74b5e8e4016b835f34cd3f48.tar.gz initscripts-1096cd2ebc150e5c74b5e8e4016b835f34cd3f48.tar.bz2 initscripts-1096cd2ebc150e5c74b5e8e4016b835f34cd3f48.tar.xz initscripts-1096cd2ebc150e5c74b5e8e4016b835f34cd3f48.zip | |
Use $() instead of `` for process expansion.
Adapted from <victor.lowther@gmail.com>.
Diffstat (limited to 'ppp')
| -rw-r--r-- | ppp/ip-down.ipv6to4 | 8 | ||||
| -rw-r--r-- | ppp/ip-up.ipv6to4 | 16 |
2 files changed, 12 insertions, 12 deletions
diff --git a/ppp/ip-down.ipv6to4 b/ppp/ip-down.ipv6to4 index 93e0d91d..d6e50b54 100644 --- a/ppp/ip-down.ipv6to4 +++ b/ppp/ip-down.ipv6to4 @@ -48,7 +48,7 @@ CONFIG=$1 source_config # IPv6 don't need aliases anymore, config is skipped -REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'` +REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') [ "$DEVICE" != "$REALDEVICE" ] && exit 0 if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then @@ -75,14 +75,14 @@ if [ $? = 0 -o $? = 11 ]; then valid6to4config="yes" # Get IPv4 address from interface - ipv4addr="`ipv6_get_ipv4addr_of_device $DEVICE`" + ipv4addr="$(ipv6_get_ipv4addr_of_device $DEVICE)" if [ -z "$ipv4addr" ]; then # Has no IPv4 address valid6to4config="no" fi # Get local IPv4 address of dedicated tunnel - ipv4addr6to4local="`ipv6_get_ipv4addr_of_tunnel tun6to4 local`" + ipv4addr6to4local="$(ipv6_get_ipv4addr_of_tunnel tun6to4 local)" # IPv6to4 not enabled on this interface? if [ $IPV6TO4INIT != "yes" ]; then @@ -104,7 +104,7 @@ if [ "$valid6to4config" = "yes" ]; then if [ -n "$IPV6TO4_ROUTING" ]; then # Delete routes to local networks for devsuf in $IPV6TO4_ROUTING; do - dev="`echo $devsuf | awk -F- '{ print $1 }'`" + dev="$(echo $devsuf | awk -F- '{ print $1 }')" ipv6_cleanup_6to4_device $dev done fi diff --git a/ppp/ip-up.ipv6to4 b/ppp/ip-up.ipv6to4 index e06cc246..8e6b094e 100644 --- a/ppp/ip-up.ipv6to4 +++ b/ppp/ip-up.ipv6to4 @@ -54,7 +54,7 @@ CONFIG=$1 source_config # IPv6 don't need aliases anymore, config is skipped -REALDEVICE=`echo ${DEVICE} | sed 's/:.*//g'` +REALDEVICE=$(echo ${DEVICE} | sed 's/:.*//g') [ "$DEVICE" != "$REALDEVICE" ] && exit 0 if [ ! -f /etc/sysconfig/network-scripts/network-functions-ipv6 ]; then @@ -75,7 +75,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then ipv4addr="$IPV6TO4_IPV4ADDR" else # Get IPv4 address from interface (precedence 2) - ipv4addr="`ipv6_get_ipv4addr_of_device $DEVICE`" + ipv4addr="$(ipv6_get_ipv4addr_of_device $DEVICE)" if [ -z "$ipv4addr" ]; then # Take configured IPv4 address of interface from config file (precedence 3) ipv4addr="$IPADDR" @@ -96,7 +96,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then fi # Check/generate relay address - ipv6to4_relay="`ipv6_create_6to4_relay_address $IPV6TO4_RELAY`" + ipv6to4_relay="$(ipv6_create_6to4_relay_address $IPV6TO4_RELAY)" if [ $? -ne 0 ]; then valid6to4config="no" fi @@ -104,7 +104,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ "$valid6to4config" = "yes" ]; then # Delete routes to local networks for devsuf in $IPV6TO4_ROUTING; do - dev="`echo $devsuf | awk -F- '{ print $1 }'`" + dev="$(echo $devsuf | awk -F- '{ print $1 }')" ipv6_cleanup_6to4_device $dev done @@ -112,7 +112,7 @@ if [ "$IPV6TO4INIT" = "yes" ]; then ipv6_cleanup_6to4_tunnels tun6to4 # Get MTU of master device - ipv4mtu="`ipv6_exec_ip link show dev $DEVICE | grep -w "mtu" | awk '{ print $5 }'`" + ipv4mtu="$(ipv6_exec_ip link show dev $DEVICE | grep -w "mtu" | awk '{ print $5 }')" if [ -n "$ipv4mtu" ]; then # IPv6 tunnel MTU is IPv4 MTU minus 20 for IPv4 header tunnelmtu=$[ $ipv4mtu - 20 ] @@ -174,12 +174,12 @@ if [ "$IPV6TO4INIT" = "yes" ]; then if [ -n "$IPV6TO4_ROUTING" ]; then # Generate 6to4 address - ipv6to4prefix="`ipv6_create_6to4_prefix $ipv4addr`" + ipv6to4prefix="$(ipv6_create_6to4_prefix $ipv4addr)" if [ -n "$ipv6to4prefix" ]; then # Add IPv6 address to interface (required interface route will be set automatically) for devsuf in $IPV6TO4_ROUTING; do - dev="`echo $devsuf | awk -F- '{ print $1 }'`" - suf="`echo $devsuf | awk -F- '{ print $2 }'`" + dev="$(echo $devsuf | awk -F- '{ print $1 }')" + suf="$(echo $devsuf | awk -F- '{ print $2 }')" ipv6_add_addr_on_device ${dev} ${ipv6to4prefix}${suf} done else |