forked from extern/shorewall_code
Revert code that assumed no CLI symlinks
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
6be89b4e2d
commit
0b3d1b1d36
@ -4382,7 +4382,6 @@ shorewall_cli() {
|
||||
g_nopager=
|
||||
g_blacklistipset=
|
||||
g_disconnect=
|
||||
g_options=
|
||||
|
||||
VERBOSE=
|
||||
VERBOSITY=1
|
||||
|
@ -47,14 +47,12 @@ setup_product_environment() { # $1 = if non-empty, source shorewallrc again now
|
||||
g_family=4
|
||||
g_tool=iptables
|
||||
g_lite=
|
||||
g_options=-l
|
||||
;;
|
||||
shorewall6)
|
||||
g_product="Shorewall6"
|
||||
g_family=6
|
||||
g_tool=ip6tables
|
||||
g_lite=
|
||||
g_options=-6l
|
||||
;;
|
||||
shorewall-lite)
|
||||
g_product="Shorewall Lite"
|
||||
|
@ -1546,16 +1546,8 @@ remote_reload_command() # $* = original arguments less the command.
|
||||
file=$(resolve_file $g_shorewalldir/firewall)
|
||||
|
||||
g_export=Yes
|
||||
#
|
||||
# Determine the remote CLI program
|
||||
#
|
||||
temp=$(rsh_command /bin/ls $sbindir/${PRODUCT}-lite 2> /dev/null)
|
||||
|
||||
if [ -n "$temp" ]; then
|
||||
program=$sbindir/${PRODUCT}-lite
|
||||
else
|
||||
program="$sbindir/shorewall $g_options"
|
||||
fi
|
||||
program=$sbindir/${PRODUCT}-lite
|
||||
#
|
||||
# Handle nonstandard remote VARDIR
|
||||
#
|
||||
|
Loading…
Reference in New Issue
Block a user