mirror of
https://gitlab.com/shorewall/code.git
synced 2024-12-18 20:30:43 +01:00
Remove a couple of hard-coded '/usr/share' in Shorewall::Config
Signed-off-by: Tom Eastep <teastep@shorewall.net>
This commit is contained in:
parent
cb159eba2e
commit
003daec41c
@ -3370,7 +3370,7 @@ sub update_config_file( $ ) {
|
|||||||
#
|
#
|
||||||
# Debian or derivative
|
# Debian or derivative
|
||||||
#
|
#
|
||||||
$fn = $annotate ? "/usr/share/doc/${product}/default-config/${product}.conf.annotated" : "/usr/share/doc/${product}/default-config/${product}.conf";
|
$fn = $annotate ? "$shorewallrc{SHAREDIR}/doc/${product}/default-config/${product}.conf.annotated" : "$shorewallrc{SHAREDIR}/doc/${product}/default-config/${product}.conf";
|
||||||
} else {
|
} else {
|
||||||
#
|
#
|
||||||
# The rest of the World
|
# The rest of the World
|
||||||
@ -4314,7 +4314,7 @@ sub append_file( $;$$ ) {
|
|||||||
|
|
||||||
$indent = '' if $unindented;
|
$indent = '' if $unindented;
|
||||||
|
|
||||||
unless ( $user_exit =~ m(^/usr/share/shorewall6?/) ) {
|
unless ( $user_exit =~ m(^$shorewallrc{SHAREDIR}/shorewall6?/) ) {
|
||||||
if ( -f $user_exit ) {
|
if ( -f $user_exit ) {
|
||||||
if ( $nomsg ) {
|
if ( $nomsg ) {
|
||||||
#
|
#
|
||||||
|
Loading…
Reference in New Issue
Block a user