holm/shorewall_code
1
0
Fork 0
forked from extern/shorewall_code
Code Pull Requests Activity

Merge branch '4.4.8' of ssh://shorewall.git.sourceforge.net/gitroot/shorewall/shorewall into 4.4.8

Browse Source
This commit is contained in:
Tom Eastep 2010-04-26 17:09:33 -07:00
commit 8547b735f7
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Shorewall/lib.common
View File

@ -431,7 +431,7 @@ find_first_interface_address() # $1 = interface
#
# get the line of output containing the first IP address
#
addr=$($IP -f inet addr show $1 2> /dev/null | grep 'inet .* global' | head -n1)
addr=$(${IP:-ip} -f inet addr show $1 2> /dev/null | grep 'inet .* global' | head -n1)
#
# If there wasn't one, bail out now
#
@ -448,7 +448,7 @@ find_first_interface_address_if_any() # $1 = interface
#
# get the line of output containing the first IP address
#
addr=$($IP -f inet addr show $1 2> /dev/null | grep 'inet .* global' | head -n1)
addr=$(${IP:-ip} -f inet addr show $1 2> /dev/null | grep 'inet .* global' | head -n1)
#
# Strip off the trailing VLSM mask (or the peer IP in case of a P-t-P link)
# along with everything else on the line

2
Shorewall/shorewall
View File

@ -39,8 +39,6 @@ get_config() {
ensure_config_path
if [ "$1" = Yes ]; then
[ -n "${IP:=ip}" ]
params=$(find_file params)
if [ -f $params ]; then

4
Shorewall6/lib.common
View File

@ -375,7 +375,7 @@ find_first_interface_address() # $1 = interface
#
# get the line of output containing the first IP address
#
addr=$($IP -f inet6 addr show $1 2> /dev/null | grep 'inet6 .* global' | head -n1)
addr=$(${IP:-ip} -f inet6 addr show $1 2> /dev/null | grep 'inet6 .* global' | head -n1)
#
# If there wasn't one, bail out now
#
@ -392,7 +392,7 @@ find_first_interface_address_if_any() # $1 = interface
#
# get the line of output containing the first IP address
#
addr=$($IP -f inet6 addr show $1 2> /dev/null | grep 'inet6 2.* global' | head -n1)
addr=$(${IP:-ip} -f inet6 addr show $1 2> /dev/null | grep 'inet6 2.* global' | head -n1)
#
# Strip off the trailing VLSM mask (or the peer IP in case of a P-t-P link)
# along with everything else on the line

2
Shorewall6/shorewall6
View File

@ -39,8 +39,6 @@ get_config() {
ensure_config_path
if [ "$1" = Yes ]; then
[ -n "${IP:=ip}" ]
params=$(find_file params)
if [ -f $params ]; then