forked from extern/shorewall_code
Split compiler and firewall into separate files
git-svn-id: https://shorewall.svn.sourceforge.net/svnroot/shorewall/trunk@3349 fbd18981-670d-0410-9b5c-8dc0c1a9a2bb
This commit is contained in:
parent
686a9e9e9f
commit
8806388b53
@ -22,3 +22,5 @@ Changes in 3.1.x.
|
||||
10) Add the "-p" option to the compile command.
|
||||
|
||||
11) Fix 'check' bug in setup_masq
|
||||
|
||||
12) Break compiler/firewall into two files
|
||||
|
@ -283,6 +283,15 @@ install_file functions ${PREFIX}/usr/share/shorewall/functions 0444
|
||||
echo
|
||||
echo "Common functions installed in ${PREFIX}/usr/share/shorewall/functions"
|
||||
|
||||
#
|
||||
# Install the Compiler
|
||||
#
|
||||
|
||||
install_file compiler ${PREFIX}/usr/share/shorewall/compiler 0555
|
||||
|
||||
echo
|
||||
echo "Compiler installed in ${PREFIX}/usr/share/shorewall/compiler"
|
||||
|
||||
#
|
||||
# Install the Help file
|
||||
#
|
||||
|
@ -664,7 +664,7 @@ compile_command() {
|
||||
|
||||
export EXPORT
|
||||
|
||||
exec $SHOREWALL_SHELL $FIREWALL $debugging generate $file
|
||||
exec $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging generate $file
|
||||
}
|
||||
#
|
||||
# Restart Command Executor
|
||||
@ -857,7 +857,7 @@ reload_command() {
|
||||
|
||||
[ -n "$nolock" ] || mutex_on
|
||||
|
||||
if $SHOREWALL_SHELL $FIREWALL $debugging $nolock compile /var/lib/shorewall/.reload; then
|
||||
if $SHOREWALL_SHELL /usr/share/shorewall/compiler $debugging $nolock compile /var/lib/shorewall/.reload; then
|
||||
$0 nolock $(make_quiet) restore .reload
|
||||
fi
|
||||
|
||||
|
@ -109,6 +109,7 @@ fi
|
||||
%attr(0644,root,root) /usr/share/shorewall/action.Limit
|
||||
%attr(0644,root,root) /usr/share/shorewall/action.Reject
|
||||
%attr(0644,root,root) /usr/share/shorewall/action.template
|
||||
%attr(0555,root,root) /usr/share/shorewall/compiler
|
||||
%attr(0444,root,root) /usr/share/shorewall/functions
|
||||
%attr(0544,root,root) /usr/share/shorewall/firewall
|
||||
%attr(0544,root,root) /usr/share/shorewall/help
|
||||
|
Loading…
Reference in New Issue
Block a user