diff --git a/Shorewall-core/lib.cli b/Shorewall-core/lib.cli index 90fb4dcee..af8c3e9c2 100644 --- a/Shorewall-core/lib.cli +++ b/Shorewall-core/lib.cli @@ -4382,7 +4382,6 @@ shorewall_cli() { g_nopager= g_blacklistipset= g_disconnect= - g_options= VERBOSE= VERBOSITY=1 diff --git a/Shorewall-core/lib.core b/Shorewall-core/lib.core index ef6e92a3c..8227f7b4d 100644 --- a/Shorewall-core/lib.core +++ b/Shorewall-core/lib.core @@ -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" diff --git a/Shorewall/lib.cli-std b/Shorewall/lib.cli-std index 6d63aa7e7..3966f2b4c 100644 --- a/Shorewall/lib.cli-std +++ b/Shorewall/lib.cli-std @@ -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 #