forked from extern/shorewall_code
Remove duplicate/unneeded functions
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
8e5114859c
commit
f8c7a284a5
@ -575,25 +575,6 @@ restore_default_route() {
|
|||||||
return $result
|
return $result
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Determine how to do "echo -e"
|
|
||||||
#
|
|
||||||
|
|
||||||
find_echo() {
|
|
||||||
local result
|
|
||||||
|
|
||||||
result=$(echo "a\tb")
|
|
||||||
[ ${#result} -eq 3 ] && { echo echo; return; }
|
|
||||||
|
|
||||||
result=$(echo -e "a\tb")
|
|
||||||
[ ${#result} -eq 3 ] && { echo "echo -e"; return; }
|
|
||||||
|
|
||||||
result=$(mywhich echo)
|
|
||||||
[ -n "$result" ] && { echo "$result -e"; return; }
|
|
||||||
|
|
||||||
echo echo
|
|
||||||
}
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Determine the MAC address of the passed IP through the passed interface
|
# Determine the MAC address of the passed IP through the passed interface
|
||||||
#
|
#
|
||||||
|
@ -338,14 +338,6 @@ resolve_file() # $1 = file name
|
|||||||
esac
|
esac
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Set the Shorewall state
|
|
||||||
#
|
|
||||||
set_state () # $1 = state
|
|
||||||
{
|
|
||||||
echo "$1 ($(date))" > ${VARDIR}/state
|
|
||||||
}
|
|
||||||
|
|
||||||
# Function to truncate a string -- It uses 'cut -b -<n>'
|
# Function to truncate a string -- It uses 'cut -b -<n>'
|
||||||
# rather than ${v:first:last} because light-weight shells like ash and
|
# rather than ${v:first:last} because light-weight shells like ash and
|
||||||
# dash do not support that form of expansion.
|
# dash do not support that form of expansion.
|
||||||
@ -428,5 +420,3 @@ mktempfile() {
|
|||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
. ${SHAREDIR}/lib.common
|
|
||||||
|
@ -153,14 +153,6 @@ qt()
|
|||||||
"$@" >/dev/null 2>&1
|
"$@" >/dev/null 2>&1
|
||||||
}
|
}
|
||||||
|
|
||||||
#
|
|
||||||
# Suppress all output for a command
|
|
||||||
#
|
|
||||||
qt()
|
|
||||||
{
|
|
||||||
"$@" >/dev/null 2>&1
|
|
||||||
}
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Determine if Shorewall is "running"
|
# Determine if Shorewall is "running"
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user