forked from extern/shorewall_code
Remove default /etc/shorewall from CONFIG_PATH under -e
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@4113 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
68fc0fb463
commit
defd05a0cd
@ -8661,6 +8661,8 @@ do_initialize() {
|
|||||||
|
|
||||||
ensure_config_path
|
ensure_config_path
|
||||||
|
|
||||||
|
[ -n "$EXPORT" ] && CONFIG_PATH=$(echo $CONFIG_PATH | sed 's|^/etc/shorewall:|/usr/share/shorewall/configfiles:|')
|
||||||
|
|
||||||
VERSION_FILE=$SHAREDIR/version
|
VERSION_FILE=$SHAREDIR/version
|
||||||
|
|
||||||
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
|
[ -f $VERSION_FILE ] && VERSION=$(cat $VERSION_FILE)
|
||||||
|
@ -512,7 +512,7 @@ fi
|
|||||||
#
|
#
|
||||||
# Install the rfc1918 file
|
# Install the rfc1918 file
|
||||||
#
|
#
|
||||||
install_file rfc1918 ${PREFIX}/usr/share/shorewall/rfc1918 0600
|
install_file rfc1918 ${PREFIX}/usr/share/shorewall/rfc1918 0644
|
||||||
echo "RFC 1918 file installed as ${PREFIX}/usr/share/shorewall/rfc1918"
|
echo "RFC 1918 file installed as ${PREFIX}/usr/share/shorewall/rfc1918"
|
||||||
#
|
#
|
||||||
# Install the default config path file
|
# Install the default config path file
|
||||||
@ -549,7 +549,7 @@ fi
|
|||||||
#
|
#
|
||||||
# Install the stop file
|
# Install the stop file
|
||||||
#
|
#
|
||||||
run_install $OWNERSHIP -m 0600 stop ${PREFIX}/usr/share/shorewall/configfiles/stop
|
run_install $OWNERSHIP -m 0644 stop ${PREFIX}/usr/share/shorewall/configfiles/stop
|
||||||
|
|
||||||
if [ ! -f ${PREFIX}/etc/shorewall/stop ]; then
|
if [ ! -f ${PREFIX}/etc/shorewall/stop ]; then
|
||||||
run_install $OWNERSHIP -m 0600 stop ${PREFIX}/etc/shorewall/stop
|
run_install $OWNERSHIP -m 0600 stop ${PREFIX}/etc/shorewall/stop
|
||||||
|
Loading…
x
Reference in New Issue
Block a user