forked from extern/shorewall_code
Eliminate g_base variable
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
aeac7cacb0
commit
66b976a934
@ -56,7 +56,6 @@ case $g_program in
|
|||||||
CONFDIR=/etc/shorewall-lite
|
CONFDIR=/etc/shorewall-lite
|
||||||
g_product="Shorewall Lite"
|
g_product="Shorewall Lite"
|
||||||
g_family=4
|
g_family=4
|
||||||
g_base=shorewall
|
|
||||||
g_tool=iptables
|
g_tool=iptables
|
||||||
g_basedir=/usr/share/shorewall-lite
|
g_basedir=/usr/share/shorewall-lite
|
||||||
g_lite=Yes
|
g_lite=Yes
|
||||||
@ -66,7 +65,6 @@ case $g_program in
|
|||||||
CONFDIR=/etc/shorewall6-lite
|
CONFDIR=/etc/shorewall6-lite
|
||||||
g_product="Shorewall6 Lite"
|
g_product="Shorewall6 Lite"
|
||||||
g_family=6
|
g_family=6
|
||||||
g_base=shorewall6
|
|
||||||
g_tool=ip6tables
|
g_tool=ip6tables
|
||||||
g_basedir=/usr/share/shorewall6-lite
|
g_basedir=/usr/share/shorewall6-lite
|
||||||
g_lite=Yes
|
g_lite=Yes
|
||||||
|
@ -2568,7 +2568,7 @@ get_config() {
|
|||||||
|
|
||||||
ensure_config_path
|
ensure_config_path
|
||||||
|
|
||||||
config=$(find_file ${g_base}-lite.conf)
|
config=$(find_file ${g_program.conf)
|
||||||
|
|
||||||
if [ -f $config ]; then
|
if [ -f $config ]; then
|
||||||
if [ -r $config ]; then
|
if [ -r $config ]; then
|
||||||
|
Loading…
Reference in New Issue
Block a user